1
0
Commit Graph

257 Commits

Author SHA1 Message Date
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