Commit Graph
419 Commits
Author SHA1 Message Date
madmaxoft c510683d2a Fixed unaligned memory access in FastNBT.
This should fix #420.
2014-01-02 17:33:18 +01:00
Tycho Bickerstaff c52a46a5e3 merged changes from upstream 2013-12-31 16:24:53 +00:00
madmaxoft d4e29a0d18 Merge branch 'FishingHook' 2014-01-01 15:31:57 +01:00
STRWarrior db00a36ff8 OnPlayerFishing doesn't have a const cItems anymore 2014-01-01 15:09:53 +01:00
andrew 852c52bee9 Fixed GetPhysicalRAMUsage on Linux 2014-01-01 11:18:56 +02:00
Tycho Bickerstaff 173ed0e653 Merge branch 'master' into cmake-fixes 2013-12-31 15:52:51 +00:00
STRWarrior 020a8b457d implemented the recommendations Xoft gave. 2013-12-31 14:53:10 +01:00
Tycho Bickerstaff c3e34ee81a removed unneccisary cast 2013-12-31 09:16:44 +01:00
Tycho Bickerstaff 1957f982bc fixed warnings in LineBlockTracer.cpp 2013-12-31 09:16:44 +01:00
Tycho Bickerstaff 8e7e990cfe fixed warnings in LightingThread.cpp 2013-12-31 09:16:43 +01:00
Tycho Bickerstaff 3da41de553 take Z axis into account when calculating neighboors in LightingThread::ChunkReady 2013-12-31 09:16:43 +01:00
Tycho Bickerstaff 2e1588820d fixed warnings in World.cpp 2013-12-31 09:16:42 +01:00
Tycho Bickerstaff 2e113c63f9 fixxed warnings in Server.cpp 2013-12-31 09:16:42 +01:00
Tycho Bickerstaff 3152c72959 fixed warnings in Inventory.cpp 2013-12-31 09:16:42 +01:00
Tycho Bickerstaff c83dfdb66e fixed warnings in bytebuffer.cpp 2013-12-31 09:16:41 +01:00
Tycho Bickerstaff e41dec458c fixed ClientHandle warnings 2013-12-31 09:16:41 +01:00
Tycho Bickerstaff 9ebc623a0a fixed warnings in webadmin.cpp 2013-12-31 09:16:41 +01:00
Tycho Bickerstaff 25d42c44d5 fixed warnings in BlockArea.cpp 2013-12-31 09:16:40 +01:00
Morgan Redshaw 782818ffb5 Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure. 2013-12-30 21:30:20 -07:00
STRWarrior cd435ffca9 Implented OnPlayerFishing and OnPlayerFished. 2013-12-30 22:56:08 +01:00
madmaxoft ee15d4e08e Fixed compilation in VC2008.
Also removed an unused inline header file (yuck).
2013-12-30 17:41:59 +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 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
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
madmaxoft 90213d324a Merge branch 'master' into cmake-win 2013-12-27 11:53:12 +01:00
madmaxoft 1cf6502be2 Made cmake compilation possible on Windows. 2013-12-27 11:51:08 +01:00
Tiger Wang f1142af455 Server now handles death messages 2013-12-26 14:55:19 +00:00
Mattes D ac0c024e31 Merge pull request #472 from mc-server/Extreme_Hills_M
Extreme hills
2013-12-26 06:20:31 -08:00
madmaxoft 2560fb40c6 Added proper precompiled headers for MSVC. 2013-12-26 14:54:46 +01:00
STRWarrior 6884d4235e Simplefied Extreme Hills M pattern select. 2013-12-26 14:37:48 +01:00
madmaxoft 5689c00131 cBlockArea: Fixed writing full-height areas. 2013-12-26 10:59:01 +01:00
Mattes D e0e01d0615 Merge pull request #461 from mc-server/repeaters
Repeaters, pressure plates, and others
2013-12-25 23:57:02 -08:00
Tiger Wang d0572e73a0 Moved increment operator to back of variables 2013-12-26 00:12:06 +00:00
STRWarrior b767fd784c Extreme Hills M biomes now generate gravel, stone and grass patterns. 2013-12-25 23:18:33 +01:00
STRWarrior e282eb73c8 Changed tbGravel. Vanilla has 3 layers of gravel and then stone. 2013-12-25 23:05:22 +01:00
STRWarrior caf3b6d70c Normal extreme hills (plus) now generate a stone/grass pattern. 2013-12-25 22:43:26 +01:00
STRWarrior 2f59a93f2a Re-added empty line. 2013-12-25 22:10:27 +01:00
STRWarrior 59b80c84fa This generates gravel in Extreme Hills M biomes. 2013-12-25 22:08:41 +01:00
Mattes D abbb82d442 Merge pull request #471 from mc-server/Fishing_Catapult
You are now able to sweep mobs to your position using fishing rods.
2013-12-25 11:48:26 -08:00
madmaxoft 77aaa5c367 Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer 2013-12-25 19:50:18 +01:00
madmaxoft c2befd9777 Fixed block area height check.
The block area couldn't be read up to chunk height.
2013-12-25 19:39:07 +01:00
tonibm19 4cee3d8fe3 (Hopefully) fixed if conditions 2013-12-25 19:32:45 +01:00
STRWarrior 5eacf327b7 Fixed Parentheses. 2013-12-25 18:14:00 +01:00