1
0
Commit Graph

3563 Commits

Author SHA1 Message Date
Mattes D
4d7f213998 Merge pull request #494 from worktycho/threadsafequeue
refactored the chunk queue into a seperate class
2014-01-04 03:52:58 -08:00
Alexander Harkness
a0932f2b1f Merge pull request #502 from bitdeli-chef/master
Add a Bitdeli Badge to README
2014-01-04 03:25:03 -08:00
Bitdeli Chef
7359533b12 Add a Bitdeli badge to README 2014-01-04 11:27:16 +00:00
Tycho
d26c0e3815 Fixed Documentation 2014-01-03 09:42:35 -08:00
Tycho
13bbb3d99d derp 2014-01-03 08:56:20 -08:00
Tycho
14ec68d8d3 actual fix 2014-01-03 08:49:14 -08:00
Tycho
0e8bb3bf41 fixed failure to return a value from Remove 2014-01-03 08:34:41 -08:00
Tycho Bickerstaff
6f3c5b806e implement xsofts recommendations 2014-01-03 11:22:01 +00:00
Tycho Bickerstaff
ea6f94f6cb Merge branch 'master' into threadsafequeue 2014-01-02 17:49:55 +00:00
Tycho Bickerstaff
d522619ce2 added documentation 2014-01-02 17:43:57 +00:00
Tycho Bickerstaff
bbdb34252e fixed a few remaining issues with worldstorage 2014-01-02 17:37:34 +00:00
Tau
be1c8bfc0c Merge remote-tracking branch 'origin/master' 2014-01-02 19:27:18 +02:00
Tau
0c095faac8 [Handy] updated for new API, fixed bugs, added warnings. Now v2. 2014-01-02 19:25:26 +02:00
Mattes D
9682740519 Merge pull request #499 from worktycho/master
fixed compiler warnings not being enabled in clang
2014-01-02 09:21:11 -08:00
Mattes D
d3dc12815b Merge pull request #479 from mc-server/cmake-win
Cmake-win
2014-01-02 09:16:11 -08:00
Tycho Bickerstaff
7076f8e73a fixed compiler warnings not being enabled in clang 2014-01-02 17:11:40 +00:00
madmaxoft
15dddc7701 More memory alignment fixes.
Ref.: #420.
2014-01-02 18:08:38 +01:00
madmaxoft
c510683d2a Fixed unaligned memory access in FastNBT.
This should fix #420.
2014-01-02 17:33:18 +01:00
Tycho Bickerstaff
042b72bc17 rewrote queue not to use promises for waits 2014-01-02 12:32:55 +00:00
Alexander Harkness
bb0d43f70e Merge pull request #484 from worktycho/cmake-fixes
fixes for mac os x
2014-01-01 10:15:21 -08:00
madmaxoft
d4e29a0d18 Merge branch 'FishingHook' 2014-01-01 15:31:57 +01:00
STRWarrior
d656c253c0 Little more documentation for OnPlayerFishing. 2014-01-01 15:18:12 +01:00
STRWarrior
78a876ace3 Using documentation Xoft recommended. 2014-01-01 15:15:56 +01:00
STRWarrior
db00a36ff8 OnPlayerFishing doesn't have a const cItems anymore 2014-01-01 15:09:53 +01:00
STRWarrior
c5b89ea0f5 Fixed typo's in the documentation. 2014-01-01 15:02:43 +01:00
Alexander Harkness
eeeb2a6d22 Merge pull request #497 from xdot/master
Fixed GetPhysicalRAMUsage on Linux
2014-01-01 01:22:24 -08:00
andrew
852c52bee9 Fixed GetPhysicalRAMUsage on Linux 2014-01-01 11:18:56 +02:00
Mattes D
a3c698596c Merge pull request #480 from mc-server/CmakeNonMixed
CMake: Fixed mismatching library vs app builds.
2013-12-31 14:32:45 -08:00
Tycho Bickerstaff
7694a0788c Merge branch 'master' into threadsafequeue
Conflicts:
	src/OSSupport/Queue.h
2013-12-31 16:32:08 +00:00
Tycho Bickerstaff
c52a46a5e3 merged changes from upstream 2013-12-31 16:24:53 +00:00
Tycho Bickerstaff
098ed91a48 fogot to add promise classes 2013-12-31 16:13:13 +00:00
Tycho Bickerstaff
512d1b9ebe clean up code for patching 2013-12-31 15:58:21 +00:00
Tycho Bickerstaff
18fb814c34 Merge branch 'master' into threadsafequeue 2013-12-31 15:53:17 +00:00
Tycho Bickerstaff
173ed0e653 Merge branch 'master' into cmake-fixes 2013-12-31 15:52:51 +00:00
Tycho Bickerstaff
f3736b1eb7 refactored chunk Queue to seperate class 2013-12-31 15:48:57 +00:00
STRWarrior
020a8b457d implemented the recommendations Xoft gave. 2013-12-31 14:53:10 +01:00
STRWarrior
db935c4194 Documented OnPlayerFished and OnPlayerFishing. 2013-12-31 14:50:46 +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
Mattes D
8003305075 Merge pull request #488 from Diusrex/master
Fixed cPlayer::IsGameModeAdventure.
2013-12-30 22:44:04 -08: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