1
0
Commit Graph

455 Commits

Author SHA1 Message Date
Bill Derouin
1c2eb4a1c0 A few more touch ups 2014-01-07 09:49:52 -06:00
Bill Derouin
ede6757f67 A few touch ups 2014-01-07 09:40:59 -06:00
Bill Derouin
5fd62f9cd7 Removed unused line 2014-01-07 09:38:51 -06:00
Bill Derouin
913841f501 Implement favicon for 1.7.2
Favicon data is a png encoded in base64 which is stored in the server
and sent in the server response packet
2014-01-07 09:31:06 -06:00
Mattes D
db978fc687 Merge pull request #511 from mc-server/CmakeOutput
Output dir set to $/MCServer.
2014-01-06 11:12:50 -08:00
Mattes D
6dd44e6230 Merge pull request #509 from Diusrex/master
Added #pragma for warnings in MSVC warnings
2014-01-06 09:15:41 -08:00
madmaxoft
0d5a5cc990 Exported cWorld::BroadcastBlockAction().
As requested in #508; no guarantees about it.
2014-01-06 16:01:20 +01:00
madmaxoft
4b54f3e3ea Output dir set to $/MCServer.
Ref.: #510.
2014-01-06 10:13:19 +01:00
madmaxoft
c9c71fe5a7 Fixed wrong enqueueing.
Fixes #505.
2014-01-06 10:09:00 +01:00
Diusrex
487c1a24de Added fake functions into cCriticalSection because of the change to ASSERT 2014-01-05 15:08:30 -07:00
Diusrex
1acbf07445 Changed the release version of ASSERT.
This was so a variable only used in ASSERT statements will not give a warning about not being used.
2014-01-05 15:07:46 -07:00
Diusrex
2dbe5033ca Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.h
I also added a warning(push)/(pop) around crpytlib.cpp because it would go crazy with warnings.

So now, the only warning from cryptopp that is not blocked is 'unreferenced local function has been removed', which also occurs at a single function.
2014-01-05 15:06:17 -07:00
Diusrex
0d5b581fcd Making all of the useful level 4 warnings be active. 2014-01-05 14:42:22 -07:00
madmaxoft
84bf32f857 Fixed cPluginManager:AddHook() binding.
Fixes #401. Old formats are still accepted, for compatibility reasons.
2014-01-05 15:46:45 +01:00
madmaxoft
0a712931b1 Fixed a race condition in the cQueue class.
Fixes #505.
2014-01-05 15:15:59 +01: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
Mattes D
d3dc12815b Merge pull request #479 from mc-server/cmake-win
Cmake-win
2014-01-02 09:16:11 -08: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
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
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
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
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