madmaxoft
3a7089539c
RankMgr: Removed unneeded testing code.
2014-08-14 23:06:46 +02:00
Christophe Piveteau
e3a74f379f
Further changes in coding style
2014-08-14 14:29: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
Christophe Piveteau
2d2d4ff33b
Further fixing of coding style errors
2014-08-13 19:47:43 +02:00
Christophe Piveteau
3f117897fb
Another intendation error
2014-08-13 19:18:11 +02:00
Christophe Piveteau
3698c5c829
Fixed braces and intendation errors
2014-08-13 19:16:00 +02:00
Christophe Piveteau
a544c0238b
Implement ability to push minecarts on curved rails
2014-08-13 18:53:23 +02:00
Tycho
f4d268636a
Fixed comments
2014-08-13 13:37:07 +01:00
Tycho
fecd607d74
Added missing header
2014-08-13 13:15:29 +01:00
Tycho
781e1e6264
Fixed Integer pasing warnings in CraftingRecipies.cpp
2014-08-13 13:03:56 +01:00
madmaxoft
36e918ce9b
File logger prefixes are 4 chars wide.
2014-08-13 13:31:19 +02:00
madmaxoft
5921f78e52
Logger: Fixed windows debug ODS logger, fixed-size file prefixes.
2014-08-13 13:28:45 +02:00
madmaxoft
08c55ef983
Logger: Fixed missing timestamp in log messages.
2014-08-13 13:27:56 +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
c3c3d3a72d
Fixed type issues in CraftingRecipe.cpp
2014-08-13 12:14:55 +01:00
Tycho
8f7b9acb48
Fixed forgotten error checking
2014-08-13 12:10:21 +01: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
madmaxoft
10e58f04da
Fixed windows compilation and style issues.
2014-08-12 22:43:04 +02:00
Tycho
01c50eb53a
Fix messing rename
2014-08-12 17:32:08 +01:00
Tycho
9844368267
Renamed Loggers
2014-08-12 16:05:04 +01: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
Howaner
cb98014582
Revert "Removes the fire if the block under the fire was broken."
...
This reverts commit 01001d2a49
2014-08-11 23:12:32 +02:00
Howaner
01001d2a49
Removes the fire if the block under the fire was broken.
2014-08-11 22:37:28 +02:00
Howaner
74fabb079c
Moved the clicked-through block check to the top of the function.
2014-08-11 22:34:33 +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
Howaner
202a0d1c1d
Fixed cancelled fire interact from all directions.
2014-08-11 14:24:36 +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
Tycho
be780b380e
Fixed Tools to work with new logging framework
2014-08-10 20:10:47 +01:00
