Mattes D
949aa2f383
cPlayer reads ranks from cRankManager.
2014-08-19 17:34:11 +02:00
madmaxoft
3a7089539c
RankMgr: Removed unneeded testing code.
2014-08-14 23:06:46 +02:00
madmaxoft
45068f9bf4
Merge branch 'master' into Ranks
2014-08-14 01:04:01 +02:00
madmaxoft
008c1cdaf4
CheckBasicStyle checks the src folder as well.
2014-08-14 01:03:30 +02:00
Mattes D
6f1fa8f26f
Merge pull request #1319 from mc-server/webadminfixes
...
A couple of fixes for issues with the webadmin
2014-08-13 13:22:26 +02:00
Tycho
2321d2af41
Fixed shadowing variable
2014-08-13 12:01:13 +01:00
Tycho
60ea4bb937
Removed unused method
2014-08-13 11:56:47 +01:00
madmaxoft
5e415c5b95
RankMgr: Fixed multithreading issues.
...
Only one thread is allowed to interact with a SQLite::Database object at a time.
Additionally, improved performance of the migration by wrapping the entire thing in a transaction.
2014-08-13 12:33:31 +02:00
madmaxoft
e110f72268
RankMgr: Initial migration code.
2014-08-13 09:53:33 +02:00
Franz Reiter
8f0c4911f7
Merge pull request #1296 from mc-server/LuaAPI
...
Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
2014-08-12 16:05:33 +02:00
madmaxoft
3020e8cc05
Merge remote-tracking branch 'origin/master' into Ranks
2014-08-12 11:10:32 +02:00
Alexander Harkness
ed79622734
Merge pull request #1316 from ChriPiv/master
...
Add entry for bat in monsters.ini
2014-08-11 19:24:33 +01:00
Christophe Piveteau
f7726317c9
Add entry for bat in monsters.ini
2014-08-11 18:57:41 +02:00
madmaxoft
e0b45c1893
Fixed unchecked return values.
2014-08-11 16:06:40 +02:00
madmaxoft
0a52ed6eb9
cProtocol172: Check return values.
...
Fixes CID 43489, CID 43490, CID 43491, CID 43493, CID 66410, CID 66411, CID 66416, CID 66417, CID 66418, CID 66419, CID 66420, CID 66421, CID 66422, CID 66423, CID 66424, CID 66425, CID 66429, CID 66430, CID 66431
2014-08-11 15:33:20 +02:00
Mattes D
ef513720fb
Merge pull request #1310 from mc-server/ChestFix
...
Fixed potential null dereference
2014-08-11 13:22:26 +02:00
Mattes D
54cf69a634
Merge pull request #1301 from mc-server/Ores
...
Ore Tweaks
2014-08-11 12:10:20 +02:00
Mattes D
06cc5c22ef
Merge pull request #1312 from mc-server/unnamed-enum
...
Various unnamed enum fixes
2014-08-11 08:28:31 +02:00
archshift
a7eb4032ee
Fixed tolua error with static initialization
2014-08-10 17:13:14 -07:00
Howaner
47c928cab7
Exported daylight cycle flag to the protocol.
2014-08-11 00:20:28 +02:00
archshift
92f67789fc
Gave names to unnamed enums
2014-08-10 15:06:59 -07:00
archshift
dba6723611
Player.cpp: change unnamed enum to constant integers
2014-08-10 15:06:59 -07:00
Mattes D
0953bf403b
Merge pull request #1311 from mc-server/CMakeFix
...
Fixed circular dependecy luaState_Call.inc
2014-08-10 23:19:54 +02:00
Tycho
df96f437a3
Fixed circular dependecy luaState_Call.inc
2014-08-10 22:15:52 +01:00
Tycho
5623a045f5
Fixed potential null dereference
...
Fixes CID 70466
2014-08-10 22:06:56 +01:00
STRWarrior
d95768d01a
Bunch of tweaks:
...
Renamed Quarts to Quartz
Using const_iterator instead of iterator
Used CheckBasicStyle script to find style errors
2014-08-10 22:36:02 +02:00
Mattes D
babc8b2d18
Merge pull request #1309 from mc-server/coverity_fixes
...
Fixed potential crash in Player.cpp
2014-08-10 22:30:26 +02:00
Tycho
07103ed9d7
Spaces
2014-08-10 21:26:28 +01:00
Mattes D
0e8871374f
Merge pull request #1299 from mc-server/Slabs
...
Send the old slab to the client when the interact cancelled.
2014-08-10 22:04:03 +02:00
Tycho
63a07b7ffc
Fixed potential crash in Player.cpp
...
Fixes CID 71780
If ShouldBroadcastDeathMessages is false the pointer would fall through to a check agaist it being a player
2014-08-10 20:47:16 +01:00
Howaner
42bad0edec
Added a comment and simplified code.
2014-08-10 20:06:03 +02:00
Mattes D
9469256cac
Merge pull request #1305 from mc-server/Food
...
Fixed swing arm animation when you ate.
2014-08-10 19:36:29 +02:00
Howaner
938bf1df69
Changed comment.
2014-08-10 17:12:08 +02:00
Howaner
ae61156391
Fixed swing arm animation when you ate.
2014-08-10 17:08:22 +02:00
Howaner
f90078c09f
Added IsDaylightCycleEnabled saving.
2014-08-10 16:48:20 +02:00
Howaner
cccc321384
Renamed functions.
2014-08-10 16:46:03 +02:00
Howaner
546dfaad3e
Merge branch 'master' into LuaAPI
2014-08-10 16:35:07 +02:00
STRWarrior
e529401dbb
Added NaturalPatches generator
...
It generates gravel and dirt.
2014-08-10 11:57:05 +02:00
STRWarrior
0ac3c67a21
Added NetherOreNests.
...
It generates Nether Quarts.
2014-08-10 11:48:05 +02:00
STRWarrior
ecfae28606
Changed cStructGenOreNests to take a list of ores + the block to replace.
2014-08-10 11:40:33 +02:00
STRWarrior
5eb5411f1e
Removed an old and outdated comment.
2014-08-10 11:06:04 +02:00
madmaxoft
53862961ab
Merge branch 'master' into Ranks
2014-08-09 22:57:58 +02:00
madmaxoft
b0dedb0197
WebAdmin: Manually exported string conversion functions.
...
ToLua generated an extra return value for GetHTMLEscapedString() and GetURLEncodedString(), making them difficult to use.
2014-08-09 22:56:15 +02:00
madmaxoft
dcef688ccc
WebAdmin: Added GetURLEncodedString().
2014-08-09 22:56:06 +02:00
madmaxoft
af202c2363
Debuggers: Disabled UUID and RankMgr tests.
2014-08-09 22:55:38 +02:00
madmaxoft
50359ce656
WebAdmin: Manually exported string conversion functions.
...
ToLua generated an extra return value for GetHTMLEscapedString() and GetURLEncodedString(), making them difficult to use.
2014-08-09 22:54:43 +02:00
madmaxoft
2ab8e76392
WebAdmin: Added GetURLEncodedString().
2014-08-09 22:34:59 +02:00
madmaxoft
0001a7c9fc
RankMgr: Added GetRankVisuals() function.
2014-08-09 17:36:19 +02:00
madmaxoft
4b1505f39d
Merge remote-tracking branch 'origin/master' into Ranks
2014-08-09 14:25:49 +02:00
madmaxoft
251f0d5b97
Debuggers: Simple cRankManager test case.
2014-08-08 23:13:43 +02:00
