flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
8,058 Commits 1 Branch 0 Tags 92 MiB
d8ac99a037
Commit Graph

3888 Commits

Author SHA1 Message Date
STRWarrior
4115724736 You can spawn snow golems with snow blocks and pumpkins. 2013-12-22 20:15:56 +01:00
STRWarrior
488d7ddd7d EnderDragons and SnowGolems are able to spawn. 2013-12-22 20:15:09 +01:00
STRWarrior
05c670dc50 Fixed cacus breaking when next to any non-air block. 2013-12-22 18:37:56 +01:00
Tycho Bickerstaff
75abce905d fixed bad merge 2013-12-22 16:33:40 +00:00
Tycho Bickerstaff
10e5540f98 merged in more warning fixes 2013-12-22 16:25:02 +00:00
Tycho Bickerstaff
a295e0c342 merged in changes 2013-12-22 16:22:25 +00:00
Tycho Bickerstaff
09b9661fff Merge branch 'master' into threadsafequeue 2013-12-22 16:14:34 +00:00
Tycho Bickerstaff
15a980a616 merged in warnings changes 2013-12-22 16:11:34 +00:00
Tycho Bickerstaff
a7a4b2886d fixed accedental commit 2013-12-22 15:55:57 +00:00
Tycho Bickerstaff
a71299c46b fixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker not 2013-12-22 15:41:01 +00:00
Tycho Bickerstaff
1a9d93665f Merge remote-tracking branch 'upstream/master' into threadsafequeue 2013-12-22 15:21:34 +00:00
madmaxoft
248ba1ea9f Added HOOK_PLUGINS_LOADED. 
This fixes #482.
 2013-12-29 12:51:58 +01:00
Mattes D
d40ed86907 Merge pull request #481 from MikeHunsinger/master 
Added function to create large birch tree images in birch forests
 2013-12-29 00:04:08 -08:00
Mike Hunsinger
b93b4c4825 Added function to create Tall Birch tree in BirchTreeForest biomes 2013-12-28 23:49:51 -07:00
madmaxoft
725b997a28 Fixed a (valid) warning in RCONServer. 2013-12-28 22:00:01 +01:00
STRWarrior
318dc76fc9 Made the lure enchantment work. 2013-12-22 16:03:11 +01:00
madmaxoft
dfa81829fe Fixed signedness warning in cItemGrid. 2013-12-22 15:45:45 +01:00
STRWarrior
5f18abaa27 Fixed compiler warning. 2013-12-22 15:30:47 +01:00
STRWarrior
8d51c22b36 Fishing underground is slower and fishing while raining is faster. 2013-12-22 15:22:50 +01:00
STRWarrior
caccf72b46 Fixed compiler warnings. 2013-12-22 14:54:07 +01:00
STRWarrior
9de847c9b1 Countdown time is between 100 and 900 ticks. 2013-12-22 14:51:19 +01:00
STRWarrior
7a299f1ba6 Fishing now uses a countdown instead of a random number each tick. 2013-12-22 14:48:22 +01:00
Tycho Bickerstaff
d724241407 converted commneted paramater names to the unused macro 2013-12-22 13:46:55 +00:00
STRWarrior
e9d1352f6e Implented BroadcastParticleEffect 2013-12-22 14:45:25 +01:00
Tycho Bickerstaff
94ca07cfbf Merge branch 'master' of github.com:mc-server/MCServer 2013-12-22 13:19:27 +00:00
Tiger Wang
acb5a36a6a Daylight sensors 2013-12-22 00:33:22 +00:00
Tiger Wang
5b2ac381b6 Fixed them again, confound it 2013-12-22 00:30:21 +00:00
STRWarrior
c676216791 Using regular assignments. 2013-12-21 22:20:54 +01:00
STRWarrior
76ff71810a Once again better Y direction for the items given when fishing. 2013-12-21 20:42:43 +01:00
STRWarrior
f244dbfb12 You are now able to get different items from fishing. 2013-12-21 19:58:52 +01:00
madmaxoft
abd1ca4fef Bindings regen script updated. 
The Bindings.cpp / .h files are no longer stored in the git repo.
 2013-12-21 19:30:16 +01:00
STRWarrior
bd6574230a Floater now dissapears when the player doesn't have an fishing rod equipped. 2013-12-21 17:31:05 +01:00
Tycho Bickerstaff
b3046a09e5 Chunk is now warnings clean 2013-12-21 15:58:21 +00:00
Tycho Bickerstaff
3289abde73 fixed hidden bug with furnaces ignoring time burnt 
this patch fixes an issue with furnaces where they would ignore the time burnt in setBurnTimes
this did not cause a problem as this function was only called with the same value as the one
it was using for time burnt
 2013-12-21 15:49:59 +00:00
Tycho Bickerstaff
9f41761e8e Root is now warnings clean 2013-12-21 15:38:37 +00:00
Tycho Bickerstaff
5034ae29b8 Piston is now warnings clean 2013-12-21 15:08:01 +00:00
Tycho Bickerstaff
38f808ac3d ChunkSender is now warnings clean 2013-12-21 15:00:31 +00:00
Tycho Bickerstaff
14d2085e35 basic threadsafe queue interface 2013-12-21 14:43:32 +00:00
Tycho Bickerstaff
b4fb8ace03 Merge branch 'cmake' of github.com:worktycho/MCServer into cmake 2013-12-21 13:33:09 +00:00
Tycho Bickerstaff
779aca6051 Merge branch 'master' into cmake 2013-12-21 13:32:40 +00:00
STRWarrior
128de10a2f You could now only get fish from non-source blocks. Fixed it. 2013-12-21 14:11:21 +01:00
STRWarrior
3c73076be4 Fixed bug where you could pickup the floater only to get one spawned instantly or the other way around. 2013-12-21 14:08:58 +01:00
STRWarrior
8efde94e4e Fixed bug where you could get fish from non-source blocks. 2013-12-21 14:07:32 +01:00
Tiger Wang
432a28d935 Fixed repeaters delay, maybe 
Also added basic daylight sensors, though because GetBlockSkylight
always is 15, it doesn't work.
 2013-12-20 21:19:13 +00:00
STRWarrior
9c575681f8 Merge branch 'master' of https://github.com/mc-server/MCServer 2013-12-20 19:50:47 +01:00
STRWarrior
6afe6b7928 Increased the range an Floater can shoot to. 2013-12-20 19:49:30 +01:00
madmaxoft
f5e6124ee0 Fixed the rest of constructor reorders. 2013-12-20 19:10:15 +01:00
STRWarrior
61120686c6 Fish now actualy jumps to the player instead of a few block bellow them. 2013-12-20 18:35:13 +01:00
STRWarrior
af98fc6170 Fixed bug where the floater could pop in the water while you could already get a fish. 2013-12-20 18:34:08 +01:00
madmaxoft
8570d08eb4 More reordering fixes. 2013-12-20 17:11:51 +01:00
tycho
f739246e52 added precompiled headers 2013-12-20 16:05:12 +00:00
madmaxoft
fc97cb8c58 Fixed a typo in cBlockArea merging code. 2013-12-20 16:48:45 +01:00
madmaxoft
d6de11da07 Sorted a few constructors to remove warnings. 2013-12-20 16:39:20 +01:00
tycho
f6d5a788aa fixed include of math on windows 2013-12-20 15:37:35 +00:00
Tycho Bickerstaff
32e6be002d Merge branch 'master' into cmake 2013-12-20 15:33:04 +00:00
madmaxoft
eabb88eb74 Fixed minor warnings. 2013-12-20 16:22:16 +01:00
madmaxoft
b66722f735 Fixed warnings in HTTP parser. 2013-12-20 16:20:54 +01:00
madmaxoft
812375fab1 Attempt at fixing cChunkDef::Height signedness. 2013-12-20 16:15:39 +01:00
madmaxoft
b6e4d2c263 Properly fixed warnings in cFastRandom. 2013-12-20 16:11:25 +01:00
madmaxoft
8610d45ef1 Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
madmaxoft
b19d765666 Fixed melon and pumpkin growing. 2013-12-20 15:50:46 +01:00
madmaxoft
00911c5f94 Fixed missing parenthesis. 2013-12-20 15:44:56 +01:00
madmaxoft
ea65243119 Fixed clang warnings in Noise.cpp. 
Fix-a-random-warning-per-day :)
 2013-12-20 10:11:33 +01:00
Tiger Wang
c08910d4af Fixed assertion during dirt block OnUpdate() 2013-12-19 23:06:26 +00:00
Mattes D
39251bccd3 Merge pull request #450 from mc-server/redstonefixes 
Multiple fixes
 2013-12-19 13:58:49 -08:00
STRWarrior
a1ce0a6d73 Fixed #include in Floater.cpp. 2013-12-19 22:44:10 +01:00
STRWarrior
32d117a498 The floater now actualy dives under water. 2013-12-19 22:18:05 +01:00
STRWarrior
018c65b4e3 You can get fish from fishing :D. Only one type of fish though. 2013-12-19 22:16:15 +01:00
Tiger Wang
03a8dfc4a8 Fixed PlayerAbilities and creative 2013-12-19 20:53:47 +00:00
Tycho Bickerstaff
cb9f30d4ee Merge branch 'cmake' of github.com:worktycho/MCServer into cmake 2013-12-19 17:21:29 +00:00
tycho
162b085d80 fixed include paths on windows and added build dir to gitignore 2013-12-20 00:31:52 +00:00
tycho
c7d766bbcc fixed compile errors with headers and math library 2013-12-20 00:22:06 +00:00
tycho
7735a956f0 Merge branch 'master' into cmake 2013-12-20 00:13:04 +00:00
tycho
44638cd24a fixed multiprocessing on windows and removed redundend compile of headers 2013-12-19 23:37:24 +00:00
Tycho Bickerstaff
fbb47cd2ae Merge branch 'master' into cmake 2013-12-19 17:14:52 +00:00
STRWarrior
d9c8ae37cf Implented cItemFishingRodHandler. 2013-12-19 17:34:03 +01:00
STRWarrior
3d70d7198d Implented IsFishing, SetIsFishing and GetFloaterID(). 2013-12-19 17:33:21 +01:00
STRWarrior
86bfed735e Added cFloater class. 2013-12-19 17:32:06 +01:00
Tycho Bickerstaff
0e6107bfdd Merge branch 'master' into cmake 2013-12-19 16:16:35 +00:00
Tiger Wang
53e8c067ea Fixed 1.7 arm swing animation 2013-12-19 16:03:43 +00:00
Tiger Wang
53ff372624 Fixed dust from being placed on nonsolids 2013-12-19 15:57:35 +00:00
Tiger Wang
b083979cb2 Fixed repeaters not updating power 2013-12-19 15:57:15 +00:00
tycho
7d096c41f7 fixed a number of windows issues 2013-12-19 15:07:45 +00:00
Tycho Bickerstaff
95c7407dd3 added md5 as a dependency for bindings 2013-12-19 00:55:01 +00:00
Tycho Bickerstaff
e2549dfcb2 added expat as lua bindings dependincy 2013-12-19 00:52:52 +00:00
Tycho Bickerstaff
afa259e530 added all cpp files to bindings 2013-12-19 00:24:47 +00:00
Tycho Bickerstaff
d2f29cb866 moved HTTPServer to globs 2013-12-19 00:16:44 +00:00
Tycho Bickerstaff
e02fbd37ab added pthread linking code to OSSupport 2013-12-19 00:15:30 +00:00
Tycho Bickerstaff
0a96bf1c03 moved protocol to glob 2013-12-19 00:11:04 +00:00
Tycho Bickerstaff
3585f93fc9 added blocks and blockentities 2013-12-19 00:06:24 +00:00
Tycho Bickerstaff
9515ece2bd linked in lua 2013-12-19 00:02:15 +00:00
Tycho Bickerstaff
cdca5a3eac Merge branch 'master' into cmake 2013-12-19 00:00:14 +00:00
Tycho Bickerstaff
7dd1561a88 fixed bindings generation 2013-12-18 23:59:07 +00:00
Tycho Bickerstaff
0dbd55614b bindings regenration logic 2013-12-18 23:14:11 +00:00
Tiger Wang
2dd823da09 Disconnection message no longer shown if ping 2013-12-18 22:06:36 +00:00
Tiger Wang
b4ac4a14fa Prettified command error messages 
Using the magic of overlords (overloads) and standards compliance.
 2013-12-18 22:05:41 +00:00
Tycho Bickerstaff
95ebc37faa added zlib and UI 2013-12-18 19:10:47 +00:00
Tycho Bickerstaff
e627f2f98c Merge branch 'master' into cmake 2013-12-18 19:06:11 +00:00
Tiger Wang
aaaa53ce9d The "<>" of a player name is now coloured 2013-12-18 18:18:06 +00:00
Tiger Wang
26632bbb8a Fixed 1.7 player disconnection not calling hook 
This fixes #357
 2013-12-18 18:17:17 +00:00
Mattes D
acf90a2c1a Merge pull request #440 from mc-server/repeaterfixes 
Fixed redstone wire and certain repeater scenarios
 2013-12-18 09:59:31 -08:00
Mattes D
b6e1f62df7 Merge pull request #442 from mc-server/Nether_Wart 
Implented Nether Wart.
 2013-12-18 09:58:41 -08:00
STRWarrior
ffca4f94c1 Implented Nether Wart. 2013-12-18 18:33:18 +01:00
Tiger Wang
db5d7963e2 Renamed back EntityAnimation to PlayerAnimation 
This fixes #411 and partially reverts
30ead79049
 2013-12-18 16:11:15 +00:00
madmaxoft
4402725c61 Removed offending tr1/memory header inclusion. 
We already use <memory> at line 160, this was a double include, additionally causing problems (#424).
 2013-12-18 12:04:31 +01:00
Tiger Wang
13a22918e5 Fixed wire powering blocks beneath 2013-12-17 23:05:42 +00:00
Tiger Wang
09c47fabd2 Fixed bad repeater power queuing in corner case 
Repeaters remain queued to power even if their original source has since
unpowered. Also functionised and cleaned up code.
 2013-12-17 23:05:27 +00:00
madmaxoft
f8f4ab88f6 Fixed player falling through the floor on spawn. 
The 1.7 client seems to have math issues with exact coords. Adding 0.001 to the Y coord fixed the problem.
 2013-12-17 20:16:06 +01:00
madmaxoft
bd568ed089 cBlockArea: origin is initialized in the constructor and the loader. 2013-12-17 20:16:06 +01:00
madmaxoft
a4f4ba534e Fixed naming and initialization. 2013-12-17 20:10:03 +01:00
STRWarrior
a74fdd9023 Forgot to change one Vector3d to Vector3i. 2013-12-17 20:04:39 +01:00
STRWarrior
a1bfc89118 Renamed Pos to m_Pos. 2013-12-17 20:02:44 +01:00
STRWarrior
f1a1d6fa5c Using Recommendations. 2013-12-17 19:42:06 +01:00
STRWarrior
d28142ff71 Made buckets work when the player does not 'look' at a block. This fixes #265 2013-12-17 17:33:48 +01:00
Tiger Wang
ed80ff9fc8 Merge pull request #438 from mc-server/Boats 
Implemented boating functionality.
 2013-12-16 14:14:44 -08:00
madmaxoft
daade8ddee Fixed multiple inheritance in ToLua++. 
This fixes #422.
 2013-12-16 22:13:46 +01:00
STRWarrior
59165dcba5 Boats spawn on top of a block. not between 4 blocks. 2013-12-16 21:50:57 +01:00
STRWarrior
6b21dc6d11 Using suggestions for Boat placing. 2013-12-16 20:53:43 +01:00
Tiger Wang
3e6fd5c6e5 Removed some old cRedstone remnants 2013-12-16 17:35:20 +00:00
STRWarrior
199123d4f2 Boats drop a boat pickup when destroyed by hand. You can now actualy use boats. 2013-12-16 18:03:39 +01:00
STRWarrior
459d636948 Added HandleSpeedFromAttachee so an entity can override the function. 2013-12-16 18:02:33 +01:00
STRWarrior
324fa55bf0 You can spawn boats on water. 2013-12-16 18:01:33 +01:00
madmaxoft
f521cbeb31 Fixed cClientHandle::Tick() being called from two threads. 
When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread.
Final fix for #187.
 2013-12-16 10:41:51 +01:00
madmaxoft
e024278b02 Fixed multiple player spawn broadcasts. 2013-12-16 10:41:50 +01:00
STRWarrior
007d668c1b Server saves if a player is flying. 2013-12-15 21:25:13 +01:00
STRWarrior
9b8112dbc2 Merge pull request #437 from mc-server/ShootTo_function 
Shoot to function
 2013-12-15 12:05:18 -08:00
madmaxoft
c33c8882b3 Fixed player spawning packet. 
The player was spawned 1.62 blocks below their pos. This fixes #323.
 2013-12-15 20:50:07 +01:00
STRWarrior
a2612fa68a Exported to Lua 2013-12-15 20:25:53 +01:00
STRWarrior
5e75408b3b Renamed ShootTo function to ForceSetSpeed. 2013-12-15 20:19:58 +01:00
madmaxoft
4ee4cab2d3 Fixed calling OnPlayerJoined() in the wrong place. 
This is the first part of a fix for #187.
 2013-12-15 20:12:55 +01:00
STRWarrior
0efd74f114 This adds a function that allows you to 'shoot' a player towards a direction. 2013-12-15 18:54:54 +01:00
Mattes D
54b5f3b712 Merge pull request #433 from mc-server/redstoneimprovements 
Fixed more wire bugs
 2013-12-15 08:18:42 -08:00
Tiger Wang
ba4eae2d16 Implemented xoft's suggestions 2013-12-15 15:36:20 +00:00
madmaxoft
368b7a40b5 Fixed indentation. 2013-12-15 15:58:03 +01:00
STRWarrior
ffb5a69a9e Moved reading flags to the protocol. 2013-12-15 15:11:59 +01:00
Tiger Wang
b87055f7a5 Fixed wire repeater checking 2013-12-15 13:56:32 +00:00
STRWarrior
9fe06af598 Exported Set and Get functions to Lua. 2013-12-15 14:52:17 +01:00
STRWarrior
b10d0b95cb Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function 2013-12-15 14:48:17 +01:00
Tiger Wang
bbcef6d6eb Wires now power repeaters properly 2013-12-15 13:08:08 +00:00
Mattes D
4f92f18a8d Merge pull request #432 from mc-server/Broadcast_Effects 
Broadcast effects
 2013-12-15 04:42:15 -08:00
Tiger Wang
ceb11cb477 Fixed the hopefully final wire self-powering bug 2013-12-15 12:17:29 +00:00
STRWarrior
828cca5c7e Fixed pre 1.7 clients crashing. 2013-12-15 11:34:00 +01:00
STRWarrior
9c2089dc5a cPlayer is using the broadcast functions. 2013-12-15 10:52:54 +01:00
STRWarrior
c56af9a214 This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions. 2013-12-15 10:51:46 +01:00
Mattes D
5e6a4c99a7 Merge pull request #431 from mc-server/Entity_Effects 
Entity Effects
 2013-12-14 14:40:24 -08:00
madmaxoft
812ea39a5c Added tolua++ redirection include. 
This is needed because ToLua++ regenerates the Bindings file with bad #include, and it would be too difficult to fix ToLua++; this is an easier solution.
Should fix PR #431.
 2013-12-14 23:34:57 +01:00
madmaxoft
322382e379 Removed leftover debugging messages from cProtocol172. 2013-12-14 23:34:56 +01:00
STRWarrior
8c04afe18a Exported E_EFFECTS_<Effect> to lua. Forgot to commit Globals.h. 2013-12-14 22:34:49 +01:00
STRWarrior
71250b275f Added E_EFFECT_<Effect> 2013-12-14 22:23:20 +01:00
Mattes D
22ee94ffaf Merge pull request #430 from mc-server/redstoneimprovements 
Implemented note block playing and fixed wire
 2013-12-14 13:00:30 -08:00
Tiger Wang
765b847281 Potentially fixed debug asserts 2013-12-14 19:29:50 +00:00
Tiger Wang
7f9f6f5095 Wires no longer power if a block cuts them off 
Also reduced more unneeded code.
 2013-12-14 19:11:15 +00:00
STRWarrior
123799a4e0 Forgot to commit the ClientHandle. 2013-12-14 18:19:56 +01:00
STRWarrior
37069288d5 Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. 2013-12-14 18:03:00 +01:00
Tiger Wang
95be80cdb5 Implemented note block playing and fixed wire 
Game of Thrones music in Minecraft, here I come!
 2013-12-14 16:52:22 +00:00
Tiger Wang
5685e5ba33 Fixed compilating! 2013-12-14 12:10:05 +00:00
Tiger Wang
4622d4ac09 Improved player permissions logging 2013-12-14 02:54:08 +00:00
Tiger Wang
0aeece7fda Fixes to redstone wire and torches 
+ Wires now power blocks around the block beneath
* Torches no longer power off if it is on a linked powered block
* Enhanced code, split functions, etc.
 2013-12-14 02:40:54 +00:00
Tiger Wang
4e11095441 Groups.ini and Users.ini are now generated 2013-12-14 02:02:26 +00:00
Tiger Wang
d94ee0fa79 Removed loads of unneeded code again 2013-12-14 01:14:09 +00:00
Tiger Wang
d110d798d2 Reduced loads of unneeded code 
Merged wire powering detection code into a single function.
 2013-12-14 00:43:05 +00:00
Mattes D
8033abe8ce Merge pull request #419 from mc-server/redstoneloading 
Redstone data is now loaded on chunk load
 2013-12-13 11:55:08 -08:00
Tiger Wang
99043091df Improved redstone loading performance 2013-12-13 19:01:15 +00:00
madmaxoft
33c6bcc2f4 Fixed threading issues affecting cProtocol172. 2013-12-13 17:53:26 +01:00
STRWarrior
39443c63ad Using "a_ClosestPlayer != NULL" in cExpOrb. 2013-12-13 15:32:25 +01:00
Tiger Wang
3757054d81 Fixed QueueSetBlock not sending to client changes 2013-12-13 00:06:47 +00:00
Tiger Wang
6b6905fe1c Redstone data is now loaded on chunk load 2013-12-12 23:49:10 +00:00
madmaxoft
91587f63c4 Unknown packet type extended to 32 bits. 2013-12-12 23:05:23 +01:00
madmaxoft
f3c9ea0ed2 Fixed protocol 1.7 recovery after unknown packet. 2013-12-12 23:05:02 +01:00
Tiger Wang
cd35bd2c49 Fixed pistons being viable middle block 
Also an excuse to update submodules
 2013-12-11 18:42:38 +00:00
Mattes D
7035d31e9d Merge pull request #417 from mc-server/WorldUpdate 
World update
 2013-12-11 08:02:45 -08:00
STRWarrior
5a39dff904 HOOK_WORLD_STARTED now gets called when the CreateAndInitializeWorld function is used. 2013-12-11 16:19:38 +01:00
STRWarrior
bba51755d4 ExpOrbs now move. 2013-12-11 16:14:08 +01:00
STRWarrior
12bd5082b8 Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins. 2013-12-11 12:39:13 +01:00
Tycho Bickerstaff
5155aa4096 added zlib 2013-12-10 23:27:35 +00:00
Tycho Bickerstaff
d59e4e6a45 moved generating to globs 2013-12-10 23:22:34 +00:00
Tycho Bickerstaff
0925ead688 added UI folder 2013-12-10 23:20:39 +00:00
Tycho Bickerstaff
d5866a0978 moved Worldstorage to globs 2013-12-10 23:18:26 +00:00
Tycho Bickerstaff
77303b77c7 Merge branch 'master' of github.com:mc-server/MCServer into cmake 2013-12-10 23:10:50 +00:00
Tycho Bickerstaff
822a92a9b6 moved entities to globs 2013-12-10 23:09:16 +00:00
Tycho Bickerstaff
ec5af4cffe moved mobs to globs 2013-12-10 23:07:30 +00:00
Tycho Bickerstaff
948fb78fa1 moved simulor to globs 2013-12-10 23:06:15 +00:00
Tycho Bickerstaff
40defa9d2d removed leakfinder form build 2013-12-10 23:04:38 +00:00
Tycho Bickerstaff
dd633d5a94 Merge branch 'master' into cmake 2013-12-10 23:01:35 +00:00
STRWarrior
78aca16d58 Exported the cTNTEntity 2013-12-14 16:28:17 +01:00
Mattes D
8a6c28b8f0 Merge pull request #423 from mc-server/redstoneimprovements 
Redstone and configuration improvements
 2013-12-14 06:41:00 -08:00
STRWarrior
664676eedf Merge branch 'master' of https://github.com/mc-server/MCServer 2013-12-14 12:51:27 +01:00
STRWarrior
483ef89503 Fixed not getting XP from mobs. 2013-12-14 12:50:08 +01:00
Tycho Bickerstaff
d9a429ec64 Merge branch 'master' into quickfixs 2013-12-10 23:01:24 +00:00
Tycho Bickerstaff
712f7d5a23 added tolua++ command and removed stackwalker from build 2013-12-10 22:59:53 +00:00
Tycho Bickerstaff
daccfd9c6e more cmake changes 2013-12-10 22:43:21 +00:00
Tycho Bickerstaff
572d48be52 removed more accedentailly commited object files 2013-12-10 21:47:23 +00:00
Tycho Bickerstaff
4300d0866d removed accedentailly commited object files 2013-12-10 21:44:11 +00:00
Tycho Bickerstaff
6cdc990884 more cmake 2013-12-10 21:39:20 +00:00
Tiger Wang
9987611792 Provides a possible fix for repeater timings 
Not completely reliable, but at least some types of clock work.
 2013-12-10 21:24:02 +00:00
Tycho Bickerstaff
973999f524 fixed unused expression warnings in blockFire 2013-12-10 19:35:05 +00:00
Tycho Bickerstaff
d9ecf51f5b more cmake stuff 2013-12-10 19:30:12 +00:00
Tycho Bickerstaff
c217ab5168 fixed comparison of thread handle to Null point rather than null handle 2013-12-10 18:43:54 +00:00
Tycho Bickerstaff
b91cfb8765 started work on cmake 2013-12-10 18:41:43 +00:00
Tycho Bickerstaff
7135bdf591 added abort to DeadlockDetector to generate core dumps on failure 2013-12-10 16:59:45 +00:00
Tycho Bickerstaff
5d2311bcff Merge remote-tracking branch 'upstream/master' 2013-12-10 16:53:46 +00:00
Mattes D
9cfd8f6910 Merge pull request #412 from mc-server/fixes 
Main feature: repeater delays!
 2013-12-10 06:19:38 -08:00
Tiger Wang
e2e8c9624c Readded initial line 2013-12-10 10:31:42 +00:00
Tiger Wang
b6e0234985 Fixed compile (alas, no more goto) 2013-12-10 10:29:36 +00:00
Tiger Wang
0905369fc7 Fixed Floody lava to stone fizzle 2013-12-10 00:29:59 +00:00
Tiger Wang
1dec73be0b Added repeater delays 
They DO sometimes get stuck though :P
 2013-12-10 00:21:24 +00:00
Tiger Wang
ebad87d870 Slight redstone wire performance improvement 2013-12-09 23:48:06 +00:00
Tiger Wang
aecdfebf36 Changed more FastSetBlocks to SetBlocks 
Fixes duplication bugs.
 2013-12-09 23:43:26 +00:00
Tiger Wang
97a1147aca Improved pickups spawning speed again 2013-12-09 23:43:06 +00:00
madmaxoft
3712ee7b11 Fixed angle normalization typo. 2013-12-08 18:54:04 +01:00
madmaxoft
4608beb3c6 Fixed tolua++ compilation. 
Duplicate files, wrong includes, const-incorrect code...
 2013-12-08 18:24:56 +01:00
madmaxoft
fd68095acc Fixed VS2008 compilation after those huge changes. 2013-12-08 18:13:30 +01:00
Mattes D
ac6b4cda7c Merge pull request #408 from mc-server/SpawnPoint_Fix 
Now spawn points will not be in deep oceans or rivers etc.
 2013-12-08 09:07:49 -08:00
STRWarrior
d85ea4f654 Now spawn points will not be in deep oceans or rivers etc. 2013-12-08 17:05:51 +01:00
Tiger Wang
9c1b7c8b6e Readded redstone lamp handler 2013-12-08 14:07:32 +00:00
Tiger Wang
1d554677b4 Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures 
Conflicts:
	src/Bindings/Bindings.cpp
	src/Bindings/Bindings.h
	src/Blocks/BlockHandler.cpp
 2013-12-08 14:02:45 +00:00
Tiger Wang
f64dd786aa Fixed tabcompletion packet, fixes #356 2013-12-08 13:37:10 +00:00
madmaxoft
6785bb7c16 Fixed normalizing large angles. 2013-12-08 13:08:56 +01:00
madmaxoft
044fd237b6 Moved bindings-related to a Bindings subfolder. 
Ref.: #407
 2013-12-08 12:17:54 +01:00
madmaxoft
62adb2b965 Fixed stationary water starting fires and flowing lava not. 2013-12-08 11:47:40 +01:00
Tiger Wang
0148685d4e Fixed falling block metas, fixes #406 2013-12-08 00:32:02 +00:00
Tycho Bickerstaff
4c2490ed17 moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741 2013-12-08 00:13:31 +00:00
Tycho Bickerstaff
2942e57f93 reordered initalisation order at src/Generating/Cave.h line 73 2013-12-08 00:08:25 +00:00
Tycho Bickerstaff
e32a224fe3 fixed warnings in src/Generating/BioGen.cpp 
removed unused variable at src/Generating/BioGen.cpp line 379
and added default fallthrough clause to switch at
src/Generating/BioGen.cpp line 725
 2013-12-07 23:56:26 +00:00
Tycho Bickerstaff
c1dbe8a19e added default fallthrough clause to switch at line 178 of src/UI/Window.cpp 2013-12-07 23:51:18 +00:00
Tycho Bickerstaff
ae369618ca Reordered Listed Initalisation order in src/UI/Window.cpp 
Reordered the Listed Initalisation order for CWindow to the
executed initalisation order. The compiler initalises values
in the order the fields are declared not the initalisations
listed
 2013-12-07 23:51:18 +00:00
Tiger Wang
838d4d5d1d Bonemeal has particles, fixes #393 2013-12-07 23:45:33 +00:00
Tycho Bickerstaff
cd7813f0f5 Removed unused variable ResultSlot 2013-12-07 23:33:18 +00:00
worktycho
604c8fd9b9 Fix Undefined behavior at Bindings/LuaWindow line 32 2013-12-09 14:17:39 +00:00
worktycho
187449824c Fix Unused Variable Warning at FluidSimulator.cpp line 169 and 176 2013-12-09 14:15:30 +00:00
worktycho
c78f67dcc0 Fixed warning unchecked enum value at Chunk.cpp line 841 2013-12-09 14:05:32 +00:00
worktycho
a99bece3fa Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54 2013-12-09 13:57:09 +00:00
Tiger Wang
b779d84663 Console trims its commands before executing 'em 2013-12-07 22:35:24 +00:00
Tiger Wang
405f67dac8 Fixed water starting fires 2013-12-07 22:35:01 +00:00
Tiger Wang
16db8533e1 Improved piston animations 2013-12-07 20:29:09 +00:00
Tiger Wang
5bed85aba0 Fixed some new 1.7 client crash bugs 
Some technical blocks were removed; trying to render them as items
caused a crash.
 2013-12-07 18:03:56 +00:00
Tiger Wang
a61082ffee Changed some FastSetBlocks to SetBlock 
Should fix some duplication glitches.
 2013-12-07 14:55:19 +00:00
Tiger Wang
1932cc38a1 Fixed trapdoors not toggling 
The redstone simulator kept on resetting them.
 2013-12-07 14:41:58 +00:00
STRWarrior
c0f091b1a3 Added a SpawnFallingBlock function so plugins can make other blocks fall. 2013-12-07 14:26:52 +01:00
Tiger Wang
347e80bdd8 Added basic ender chests 
Note that they just mirror chests now, so no per player inventory.
 2013-12-07 00:18:58 +00:00
Tiger Wang
30ead79049 Renamed animation function 
Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just
players can have animations, you know.
 2013-12-06 23:47:07 +00:00
Tiger Wang
a5dd0e2b88 Fixed bed leave animation 2013-12-06 22:45:55 +00:00
Tiger Wang
b028731726 Fixed duplication glitch with QueueSetBlock 
If a coordinate was queued, and then the block there was broken, it
would reappear: double items!

Also now just sets meta if previous and current blocktypes matched.
 2013-12-06 22:29:15 +00:00
Tiger Wang
b115f3d636 Added trapdoor cursor Y detection 2013-12-06 21:31:55 +00:00
Tiger Wang
ec226e00ab Puking now uses GetEyeHeight() 2013-12-06 20:41:58 +00:00
Tiger Wang
e2a557f46c Added pickup invalid item check 
They aren't spawned at all if their itemtype isn't valid; possibly fixes
the client crashing with bad pickups.
 2013-12-06 20:39:42 +00:00
Tiger Wang
126577214a Re-implemented redstone duplicate checking 2013-12-06 20:33:48 +00:00
Tiger Wang
289e8cba21 Fixed eating using wrong animation 2013-12-06 20:28:27 +00:00
Tiger Wang
008c515b4b Fixed trapdoors not overriding OnUse 2013-12-06 20:01:52 +00:00
Tiger Wang
6c7de446ae Spawn eggs use IsGameMode() 
Possible fix for #316.
 2013-12-06 20:00:49 +00:00
Tiger Wang
44d5fd1e87 Tools make a sound when breaking, fixes #266 2013-12-06 19:59:14 +00:00
Tiger Wang
77a7bfb3e5 Cleaned up torch code and added comments 2013-12-06 19:35:10 +00:00
Tiger Wang
73dd2e9bed Removed another export and inline'd stuff 2013-12-06 19:24:45 +00:00
Tiger Wang
0376b847d7 Removed exporting of a torch function 2013-12-06 19:23:27 +00:00
Tiger Wang
57b8b38511 Updated comments for slabs 2013-12-06 19:22:25 +00:00
Tiger Wang
ee4d57a076 Fixed pickups spawning for BlockEntities 2013-12-06 19:17:57 +00:00
Mattes D
dde1c3a7cd Merge pull request #394 from SamJBarney/master 
Fire no longer goes out when on top of nether rack
 2013-12-06 02:41:37 -08:00
madmaxoft
1205c540ee Added cPluginManager:GetCurrentPlugin() to Lua API. 2013-12-05 22:03:07 +01:00
Samuel Barney
d62bfdaca4 Merged if statements. 2013-12-05 10:01:23 -07:00
Samuel Barney
3d9396b097 Finished Merge 2013-12-05 07:34:56 -07:00
Samuel Barney
8acfe21503 Merge branch 'master' of https://github.com/mc-server/MCServer 
Conflicts:
	src/Simulator/FireSimulator.h
 2013-12-05 07:32:19 -07:00
madmaxoft
321b259213 ByteBuffer: Fixed optimization failures with threading checks. 2013-12-05 10:33:26 +01:00
Alexander Harkness
9f1efbdf21 Hopefully fixed the sparc not being detected 2013-12-04 18:57:23 +00:00
madmaxoft
e48168aa13 Lava can spawn fire. 
Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65.
 2013-12-04 19:48:42 +01:00
madmaxoft
be1cdadda7 Fixed an error in cChunk's block ticking. 
Absolute coords were passed to a handler expecting relative coords.
 2013-12-04 19:47:08 +01:00
Samuel Barney
efae54db0a Made suggested changes 2013-12-03 19:05:34 -07:00
Samuel Barney
30906a597c Fire no longer goes out when on top of nether rack 2013-12-02 14:11:45 -07:00
Samuel Barney
53d5eb09e0 Removed stray printf, again. 2013-12-02 09:56:42 -07:00
Samuel Barney
050702eaa1 Switched to using provided ReadItem function. 
Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs.
 2013-12-02 09:32:28 -07:00
Samuel Barney
9e75df6a41 Removed stray printf. 2013-12-02 00:51:39 -07:00
Samuel Barney
458eff560b Fixed 1.7 slab and stair placement. 2013-12-01 20:40:12 -07:00
madmaxoft
ffd2caea66 Fixed compiler warnings in LightingThread.cpp. 2013-12-01 14:04:17 +01:00
madmaxoft
3dfd051fcb Fixed linux compile errors and formatting in RedstoneSimulator.cpp 2013-12-01 13:58:04 +01:00
madmaxoft
bf30528ec4 DeadlockDetect is configurable now. 
This is needed when debugging Lua plugins.
 2013-11-30 22:14:47 +01:00
madmaxoft
9a36564ce9 Fixed compiler warnings in IsBiomeNoDownfall(). 2013-11-30 19:13:04 +01:00
Mattes D
2bbe5046e9 Merge pull request #387 from mc-server/trapdoors 
Trapdoors, redstone fixes, and snow
 2013-11-30 07:20:27 -08:00
Tiger Wang
fad43f0c40 Fixed pistons extending 
They didn't when a source was in front, but now they do! Yay!
 2013-11-30 15:07:21 +00:00
madmaxoft
c70c2fa42f Changed cBlockHandler->OnUpdate() to use cChunk directly. 2013-11-30 15:58:27 +01:00
madmaxoft
8eae5f2f3a Added IsBiomeNoDownfall() function. 2013-11-30 15:57:56 +01:00
madmaxoft
78f9d97459 Explicitly set spawnpoint fixes. 
The value names are case-insensitive.
The debug message is printed only once.
 2013-11-30 15:03:29 +01:00
Tiger Wang
363db1bdc4 Removed redstone duplicate power checking 
There was no need for it, and it introduced some bugs.
 2013-11-30 13:52:11 +00:00
Tiger Wang
d12106ee97 Improved piston direction checking 
Now uses AddFaceDirection, as suggested by xoft.
 2013-11-30 13:41:40 +00:00
madmaxoft
2383016b1d Added the real tick duration to the OnWorldTick hook. 2013-11-30 14:22:26 +01:00
madmaxoft
463de118a0 Grass doesn't spread to podzol or grassless dirt blocks. 2013-11-30 13:48:22 +01:00
madmaxoft
754d991b4f Added floor pattern for MegaTaiga biomes. 2013-11-30 13:34:52 +01:00
Tiger Wang
455686e3ad Pistons no longer accept power through front face 
This fixes #60.
 2013-11-30 12:11:39 +00:00
Tiger Wang
ab382ef6b4 Fixed thin snow CanBeAt checking 
Now takes into account the possibility that thin snow can be on top of
full thin snow.
 2013-11-30 11:45:23 +00:00
Tiger Wang
0e0baa940a Properly fixed snow height, fixes #98 and #264 2013-11-30 00:31:21 +00:00
Tiger Wang
8d88c8f26f Improved redstone speed and fixed a wire bug 
The redstone simulator no longer goes through the Powered and
LinkedPowered blocks lists for EVERY item in the chunk data, instead,
only at every tick.
Also, wires powering each other that had the same data value is now
fixed.
 2013-11-30 00:30:49 +00:00
Tiger Wang
4741e5e794 Stairs reset meta when dropped, fixes #269 
Additionally, they now have walking sounds.
 2013-11-29 22:28:59 +00:00
Tiger Wang
1d69c80ad3 Implemented trapdoors, fixes #43 and #105 
Also updated redstone simulator to support it
 2013-11-29 22:27:08 +00:00
Tiger Wang
cee5160be8 Removed unneeded CPP files 
Also removed unneeded #include in BlockStems
 2013-11-29 22:25:07 +00:00
madmaxoft
78f0195d26 Implemented mesa biomes in DistortedHeightmap CompoGen. 2013-11-29 21:47:09 +01:00
madmaxoft
cbe8d1aa6d Fixed CheckerboardBiomeGen in negative coords. 2013-11-29 21:45:20 +01:00
madmaxoft
9b881a15ef DistortedHeightmap: Improved speed, prepared for mesa biomes. 
This generates the rainbow-mesa as seen on the first mesa screenshot in the forum.
 2013-11-29 18:42:56 +01:00
madmaxoft
3963a72046 Fixed an off-by-one error in cByteBuffer. 
Could have caused random protocol errors and maybe even crashes.
 2013-11-29 18:39:40 +01:00
madmaxoft
f027b71a31 Alpha-sorted BlockMetas, added red sand. 2013-11-29 18:38:27 +01:00
madmaxoft
f6df5cea87 Trees will generate in the new biomes. 
Only the generic trees, the special variants haven't yet been implemented.
 2013-11-28 22:08:42 +01:00
madmaxoft
057821d9b7 Added new biomes to old composition generator. 
Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators.
 2013-11-28 21:51:18 +01:00
madmaxoft
95ab73e4ed Added new biomes to old height generators. 
Now Biomal and DistortedHeight generators will work with new biomes.
 2013-11-28 21:15:50 +01:00
madmaxoft
c0a6c2b533 Moved BiomeGen creation from INI file data to BioGen.cpp. 
This way it can be shared between MCServer and BiomeVisualiser.
 2013-11-28 20:15:52 +01:00
madmaxoft
012840360e Moved json includes to where they are really needed. 2013-11-28 20:14:34 +01:00
madmaxoft
bdd86d7934 BiomeVisualiser: Added the TwoLevel biome generator. 2013-11-28 20:00:30 +01:00
Tiger Wang
96759637e9 Fixed a bug with TNT waking simulators 2013-11-28 18:24:25 +00:00
Tiger Wang
f9e1be0d57 Improved TNT pickup randomisation 2013-11-28 18:22:13 +00:00
Tiger Wang
994e1d7335 Made TNT pickups spawning chance 25% 2013-11-27 22:03:04 +00:00
Tiger Wang
a6630d3239 Merged master into redstonefixes 2013-11-27 21:35:13 +00:00
madmaxoft
bec27617a2 Voronoi-related biomegens use the new cVoronoiMap class. 2013-11-27 21:42:34 +01:00
Alexander Harkness
596963743e Fixed a load of issues, clang autodetection works now. 
This fixes issue #210.
This also removes the disableasm option, so it would be wise to remove
it from any scripts that use it.
I also removed a random line in the middle of globals.h, why was it
there?
 2013-11-27 17:18:40 +00:00
madmaxoft
ac793df2ab Added missing files for Voronoi map generation. 2013-11-27 14:26:28 +01:00
madmaxoft
2113ca3844 Fixed VC2008 compilation, normalized include paths. 2013-11-27 09:17:25 +01:00
Alexander Harkness
d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Alexander Harkness
3b790bbf67 Fixed some of tiger's derpyness. 2013-11-27 07:27:19 +00:00
Tiger Wang
e1f3cb1879 ANOTHER compile fix 
This one was broken by bear. :P
 2013-11-26 22:56:35 +00:00
Tiger Wang
2ef9cf700d Hopefully fixed last of the Linux compile errors 2013-11-26 22:50:33 +00:00
Tiger Wang
3e3e63d946 Compile fix again 2013-11-26 22:45:08 +00:00
Tiger Wang
f87bb1619e Fixed Linux compile again 2013-11-26 22:43:22 +00:00
Tiger Wang
1c526ed52b Fixed tolua++ files 2013-11-26 22:11:40 +00:00
Alexander Harkness
0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	VC2008/MCServer.vcproj
 2013-11-26 17:21:06 +00:00
Alexander Harkness
139bd34690 Merge branch 'master' into foldermove2 2013-11-26 17:15:39 +00:00
Alexander Harkness
770ef8c60b Fixed loads more of them. 2013-11-26 17:14:46 +00:00
Alexander Harkness
0b153f62f0 Another 2013-11-26 17:09:04 +00:00
Alexander Harkness
a6b67e9cc1 And another. 2013-11-26 17:06:58 +00:00
Alexander Harkness
c775011c98 Fixed another. 2013-11-26 17:06:26 +00:00
Alexander Harkness
66482c9db7 Fixed another one. 2013-11-26 17:06:00 +00:00
Alexander Harkness
f792117ce5 Fixed a mis-include 2013-11-26 17:04:07 +00:00
Tiger Wang
32449f1fca Further attempts to fix compile 2013-11-25 18:29:36 +00:00
Tiger Wang
e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Tiger Wang
16435995a5 Moved SQLite, LuaExpat, and MD5 to /lib 2013-11-24 17:33:47 +00:00
Alexander Harkness
c3cd436ec3 Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	GNUmakefile
 2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00
faketruth
01a4ab7726 Android: Moved Android stuff to the ~/trunk/Android/ folder! 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@758 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-19 16:43:47 +00:00
faketruth
e5bef782fc Android: Finally a log! :D 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@754 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-19 00:35:19 +00:00
faketruth
cc13cbbe3d Android: Showing last MCServer related logcat message 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@753 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-18 23:42:27 +00:00
faketruth
b6138129e6 Android: I'm probably using a lot of bad practices, but the app looks somewhat better now and polls the server status 
Android: Put quite some testing code in ToJava.h and app-android.cpp ... I still can't send log messages to Java. The issue is threads, I can't use JNI stuff from threads that were not created by Java (at least not easily)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@752 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-18 21:00:51 +00:00
faketruth
c40af4c4ab Android: Pressing back button sends stop command to server 
Android: ToJava can call functions on Java by using JNI
Android: Plugins work
Android: Added android specific files to VS2008 project, but they are excluded from compiling

git-svn-id: http://mc-server.googlecode.com/svn/trunk@747 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-17 22:20:35 +00:00
faketruth
33ca4d5003 MCServer should run just fine on Android now :D 
The server is also stoppable from Android

git-svn-id: http://mc-server.googlecode.com/svn/trunk@743 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-16 20:28:14 +00:00
faketruth
d21e4dacf7 Compiles on Android! Added Eclipse project, import it into your workspace and it should be runnable on Android! 
Disabled Squirrel for Android
cLog now logs to Android LogCat as well
Fixed Lua so it compiles on Android
Removed/commented out exceptions in JsonCpp so it compiles on Android

git-svn-id: http://mc-server.googlecode.com/svn/trunk@741 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2012-08-15 21:24:11 +00:00