flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
6,754 Commits 1 Branch 0 Tags 92 MiB
fe3d8fd810
Commit Graph

2952 Commits

Author SHA1 Message Date
Mattes D
949aa2f383 cPlayer reads ranks from cRankManager. 2014-08-19 17:34:11 +02:00
Mattes D
e4fc05574b Player: Silenced a few type conversion warnings. 2014-08-18 22:48:15 +02:00
Mattes D
80559406f9 Player saving creates the "players" folder, if needed. 
Fixes #1268.
 2014-08-17 22:47:00 +02:00
STRWarrior
9522bd842e SwamplandM: Fixed sometimes having no mountains. 2014-08-18 12:53:36 +02:00
Howaner
a68c70c900 Better OnPlayerMoving hook. 2014-08-16 18:44:14 +02:00
Howaner
9395cf0bca First implementation of HOOK_SERVER_PING. 2014-08-16 18:02:16 +02:00
Mattes D
e553d58eaf Merge pull request #1308 from mc-server/logger 
New Logging framework
 2014-08-15 07:20:37 +02:00
madmaxoft
1f4a1383c2 Removed an unneeded cast. 2014-08-15 07:19:13 +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
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
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
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
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
Tycho
bf0050e066 Added forgoten files 2014-08-10 19:44:49 +01:00
Tycho
806d0936dc First Implementatation of new Loggin framework 2014-08-10 19:34:11 +01:00
Howaner
42bad0edec Added a comment and simplified code. 2014-08-10 20:06:03 +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
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
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
f1dc299fdb Exported cRankManager to LuaAPI. 2014-08-08 23:12:22 +02:00
madmaxoft
3df7d8446c cLuaState: Added GetStackValues() auto-generated templates. 
These will read consecutive values off the stack, each value of a type independent of the other values.
Auto-generated because we don't have variadic templates in C++03.
 2014-08-08 23:11:42 +02:00
Howaner
32e1e9a553 Renamed m_DoDaylightCycle to m_CycleDaylight. 2014-08-08 22:07:30 +02:00
Howaner
ebfc0fdc67 Added comment. 2014-08-08 22:04:53 +02:00
madmaxoft
89333c5870 RankMgr: Finished API implementation. 2014-08-08 21:30:47 +02:00
Howaner
3d68466ab0 Send the old slab to the client when the interact cancelled. 2014-08-08 18:55:05 +02:00
madmaxoft
a5b35e09ce RankMgr: Implemented GetXforY and GetAll APIs. 2014-08-08 16:38:38 +02:00
madmaxoft
65b81b4ab7 RankMgr: Implemented the basic API functions. 2014-08-08 10:02:25 +02:00
madmaxoft
670e94bfeb RankMgr: Renamed PermissionGroup to Group in API and PermGroup in DB. 
"Group" is SQL keyword and shouldn't be used as table name.
 2014-08-08 09:56:28 +02:00
Mattes D
27a818e173 Merge pull request #1295 from mc-server/crystal 
On destroy ender crystal, create bedrock and fire.
 2014-08-07 09:20:34 +02:00
Howaner
a73c85d7eb Fixed nether wart digging. 
Fixes #1265
 2014-08-07 02:42:42 +02:00
Howaner
0c622522ea Removed debug message. 2014-08-07 01:08:31 +02:00
Howaner
4271d719b6 Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. 
I need this for a GameRule plugin.
 2014-08-07 01:07:32 +02:00
archshift
beab61bbfe On destroy ender crystal, create bedrock and fire 2014-08-06 14:16:36 -07:00
Mattes D
eae42d91f9 Merge pull request #1291 from mc-server/RedstoneCleanUp 
Redstone clean up
 2014-08-06 17:14:39 +02:00
Tycho
6acddd0cad Fixed style issues 2014-08-06 13:19:22 +01:00
Tycho
a0ba7426c6 Fixed multiple inhertance being output by tolua 2014-08-06 13:17:05 +01:00
Howaner
ff7171fc5a Resending fire to the client when the interact cancelled. 2014-08-06 14:04:25 +02:00
Tycho
9272bd627c Removed dependecy of redstone simulator on NoteBlock 2014-08-05 22:54:36 +01:00
Tycho
06942871dd Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity Directly 2014-08-05 21:48:23 +01:00
madmaxoft
a717a7e712 RankMgr: Added SQL integer datatypes. 2014-08-05 22:32:26 +02:00
madmaxoft
fcfae02525 RankMgr: More interface. 2014-08-05 22:28:37 +02:00
Howaner
5f04488a97 Made lua clamp() compatible with all number types. 2014-08-05 18:39:18 +02:00
madmaxoft
40e15c5ad5 RankMgr: Initial interface declaration. 2014-08-05 18:37:00 +02:00
Howaner
43de9af878 Added api documentation for Clamp() 2014-08-05 13:54:04 +02:00
Howaner
a92cff20ea Added Clamp() function to the lua api. 2014-08-05 13:47:10 +02:00
archshift
d2d0ffee21 Fixed unsigned long comparison to size_t 2014-08-04 19:43:33 -07:00
madmaxoft
9113b45673 MojangAPI: Fixed PlayerNameToUUID(). 2014-08-04 23:35:50 +02:00
Franz Reiter
e2c4fbd4e2 Merge pull request #1287 from Howaner/Bow 
Added arrow consuming on shooting
 2014-08-04 22:30:58 +02:00
Howaner
2e43eaaba7 Changed arrow comment. 2014-08-04 22:30:13 +02:00
Tiger Wang
a032594bf7 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-08-04 21:24:31 +01:00
Tiger Wang
0b9eb20b92 Fixed signs not staying on other signs 2014-08-04 21:22:08 +01:00
Tiger Wang
de9d908792 Made AllToLua output consistent 2014-08-04 21:21:35 +01:00
Howaner
434ea542e1 Added arrow consuming on shooting 2014-08-04 21:48:33 +02:00
Howaner
f5b71cc1f8 Fixed #1286 2014-08-04 20:16:52 +02:00
madmaxoft
7bfb0b05d0 CheckBasicStyle: multi-level indent change. 2014-08-04 13:20:29 +02:00
madmaxoft
ff37192e94 BasicStyleCheck: Dividers are exactly 80 slashes. 2014-08-04 13:20:28 +02:00
Howaner
7bd414e9ed Merge branch 'master' into Monster 2014-08-04 12:11:38 +02:00