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
Alexander Harkness
c1bc26f1ed
Merge pull request #429 from worktycho/quickfixs
...
a couple of fixes for warnings
2013-12-14 07:49:00 -08:00
STRWarrior
5d21ec7f7c
Merge branch 'master' of https://github.com/mc-server/MCServer
2013-12-14 16:41:51 +01:00
STRWarrior
a4393dbf6c
Documented cTNTEntity.
2013-12-14 16:40:51 +01:00
Mattes D
2aa98c7beb
Merge pull request #428 from mc-server/cTNTEntity_Export
...
Exported the cTNTEntity
2013-12-14 07:32:14 -08:00
STRWarrior
78aca16d58
Exported the cTNTEntity
2013-12-14 16:28:17 +01:00
Mattes D
3bf65e986b
Merge pull request #426 from SamJBarney/master
...
Fixed clang autodetection.
2013-12-14 06:51:58 -08:00
Samuel Barney
8c695b45da
Fixed clang autodetection.
2013-12-14 07:47:29 -07:00
Mattes D
8a6c28b8f0
Merge pull request #423 from mc-server/redstoneimprovements
...
Redstone and configuration improvements
2013-12-14 06:41:00 -08:00
Tiger Wang
46787a8a1b
Update Core
2013-12-14 12:29:43 +00:00
Tiger Wang
5685e5ba33
Fixed compilating!
2013-12-14 12:10:05 +00: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
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
e03e8b7b30
Documented OnWorldStarted.
2013-12-11 12:44:13 +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
Mattes D
858b03deb4
Merge pull request #416 from mc-server/repeaterfix
...
Provides a possible fix for repeater timings
2013-12-10 22:36:31 -08:00
Tycho Bickerstaff
d9a429ec64
Merge branch 'master' into quickfixs
2013-12-10 23:01:24 +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
Mattes D
60ca21b598
Merge pull request #414 from worktycho/abortondeadlock
...
add abort call to deadlock detection code
2013-12-10 12:55:57 -08:00
Tycho Bickerstaff
973999f524
fixed unused expression warnings in blockFire
2013-12-10 19:35:05 +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
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
