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
