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

3116 Commits

Author SHA1 Message Date
Mattes D
e4fc05574b Player: Silenced a few type conversion warnings. 2014-08-18 22:48:15 +02:00
Christophe Piveteau
c70886a712 Adjust comment formatting 2014-08-18 01:57:44 +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
Christophe Piveteau
72c02ceb17 Added a lot of comments 2014-08-15 17:54:43 +02:00
Christophe Piveteau
c473d8cfb8 Clarify comment message 2014-08-15 14:00:51 +02:00
Christophe Piveteau
be03b84048 End of comment moved away from new line 2014-08-15 13:43:45 +02:00
Christophe Piveteau
0f631febfc Add some comments 2014-08-15 13:40:56 +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
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
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
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
Mattes D
7b986e65d2 Merge pull request #1285 from mc-server/StrCaseRefactor 
Refactored case-conversion functions.
 2014-08-04 12:02:57 +02:00
Mattes D
f619a9953a Merge pull request #1283 from Howaner/GlobalFixes 
Fixed skins in mc 1.7.9/1.7.10
 2014-08-04 12:02:22 +02:00
madmaxoft
1fa210c7f9 Refactored case-conversion functions. 
StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
 2014-08-04 11:30:20 +02:00
madmaxoft
054ce9bcc4 Anvil: Wolf owner not saved if not present. 2014-08-04 11:29:40 +02:00
Howaner
8cdcfcceb3 Changed properties for-loop. 2014-08-04 11:26:31 +02:00
Howaner
e70077361d Changed /** to /* 2014-08-04 11:23:35 +02:00
madmaxoft
122344bb7a Rewritten string case manipulation to use std::transform. 2014-08-04 08:00:49 +02:00
Howaner
7bea90d6ca Fixed warnings 2014-08-04 01:35:25 +02:00
Howaner
0911072d27 Attempt to fix knockback and swimming. 2014-08-04 01:34:12 +02:00
Howaner
65720c8db1 Merge branch 'master' into GlobalFixes 2014-08-03 22:21:49 +02:00
madmaxoft
b19874e6f2 Attempting a compilation fix for gcc / clang. 2014-08-03 22:19:43 +02:00
Howaner
977a9948b9 Fixed skins in mc 1.7.9/1.7.10 2014-08-03 22:15:26 +02:00
madmaxoft
3136fc6246 Wolf uses UUID for owner. 
Fixes #1277.
 2014-08-03 22:04:52 +02:00
madmaxoft
21f52676f3 cMojangAPI: Added UUID-to-Name lookup. 
Also fixed the bindings, now all functions are static-like.
 2014-08-03 22:04:51 +02:00
madmaxoft
98a13d97b3 Trailing whitespace fix. 2014-08-03 22:04:50 +02:00
madmaxoft
003f18bd0f Added cMojangAPI:GetUUIDFromPlayerName(). 
This is a simpler way to ask for a single name -> uuid conversion.
 2014-08-03 22:04:50 +02:00
madmaxoft
836de13797 Added cPlayer::GetUUID(). 2014-08-03 22:04:48 +02:00
madmaxoft
6ce61d1a6f Fixed a ToLua warning - operator = not supported. 2014-08-03 22:04:48 +02:00
STRWarrior
a24e960a89 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-08-03 15:32:45 +02:00
STRWarrior
dd9a19e395 VillageGen: Fixed a typo in comment 2014-08-03 15:31:59 +02:00
archshift
e461df0030 Entity.cpp: Air timer comment fix 2014-08-03 02:20:48 -07:00
archshift
9ecce2366e Code reduction and clarity fixes 2014-08-02 22:35:29 -07:00
archshift
3ffec92e79 Removed unused cPlayer::FoodPoison function 2014-08-02 22:27:27 -07:00
archshift
7915c4ca7c Entity.cpp: On portal check, use if-else for current dimension 
If current dimension corresponds with the portal (nether portal in the nether) send to the overworld, else send to the portal dimension. No need to switch on the dimension and exclude potential others.
 2014-08-02 21:44:02 -07:00
STRWarrior
a44fbf2338 Added proper trees and height for SwamplandM biome 2014-08-02 21:44:16 +02:00
Howaner
3b4255dbfe Fixed a bug who can used from hacked clients. 2014-08-02 00:14:05 +02:00
Tiger Wang
b5c0a4aa3a Fixed issues with autocomplete and time loading 
* Fixes #1274
 2014-08-01 22:15:34 +01:00
Tiger Wang
c865fc8ca5 Improved endermen code a little 2014-08-01 22:15:32 +01:00
Mattes D
941a182d8a Merge pull request #1255 from mc-server/NameToUUID 
Name to UUID
 2014-08-01 22:35:12 +02:00
Howaner
bfe11024ac Added missing HOOK_BLOCK_SPREAD call. 2014-08-01 19:37:08 +02:00
Mattes D
d2744713bb Merge pull request #1272 from Howaner/Food 
Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
 2014-08-01 17:43:18 +02:00
Mattes D
35cfbfd51a Merge pull request #1269 from Howaner/BlockEntitys 
Added beacon.
 2014-08-01 17:43:02 +02:00
Howaner
86d84bcb73 Compile fix. 2014-08-01 17:29:17 +02:00
Howaner
160fa3a9a9 Import Statistics.h 2014-07-31 23:56:49 +02:00
Mattes D
a9317ac372 Merge pull request #1270 from Howaner/Options 
Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator
 2014-07-31 23:45:01 +02:00
Mattes D
bc1cfd5942 Merge pull request #1271 from Howaner/GlobalFixes 
Fixed water from ice and removed packed ice drop.
 2014-07-31 23:37:37 +02:00
Tiger Wang
1094d91fba Merge pull request #1047 from mc-server/Enderman 
Enderman attacks a player if he's looking at him
 2014-07-31 22:20:05 +01:00
Howaner
09b63565bc Use "default:" in switch. 2014-07-31 23:19:05 +02:00
madmaxoft
6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
Howaner
cfaef0de38 Capitalised "incremental" 2014-07-31 23:11:51 +02:00
Howaner
87d195171a Changed IsSolid to FullyOccupiesVoxel 2014-07-31 23:08:08 +02:00
Howaner
84462ba8b2 Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects. 2014-07-31 23:04:00 +02:00
madmaxoft
70fd7caf1f Removed trailing whitespace. 2014-07-31 22:54:45 +02:00
madmaxoft
ecb86935f8 Fixed UUIDs handling in cPlayer. 
The loading expected dashed UUIDs, MCS uses short UUIDs throughout.
 2014-07-31 22:52:06 +02:00
Tiger Wang
ffd6797fe1 Comment suggestions 2014-07-31 18:17:21 +01:00
Howaner
bffad50436 Fixed water from ice and removed packed ice drop. 2014-07-31 18:41:48 +02:00
Howaner
f47765dcbd Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator. 2014-07-31 18:21:45 +02:00
Howaner
6b1f7e7a45 Renamed "select..." methods to "set..." and better IsValidEffect() function. 2014-07-31 18:15:39 +02:00
madmaxoft
59adf113f0 MojangAPI: Moved the settings to a separate ini section. 2014-07-31 17:22:48 +02:00
Howaner
c49d4fd215 Updated documentation. 2014-07-31 12:15:18 +02:00
Howaner
556fc908ae Renamed functions and added beacon json saving. 2014-07-31 12:13:11 +02:00
madmaxoft
8b519bf6e2 MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames(). 2014-07-31 10:02:50 +02:00
Howaner
e6ca5a5ece Added window update. 2014-07-30 22:54:19 +02:00
Howaner
dcd226d904 Added beacon load/save. 2014-07-30 22:50:34 +02:00
STRWarrior
7821326370 Suggestions 2014-07-30 22:43:59 +02:00
Howaner
ad4fa6eba8 Changed return type from GetPrimaryPotion() and GetSecondaryPotion() 2014-07-30 22:22:06 +02:00
Howaner
81e095adda Exported the beacon. 2014-07-30 22:19:51 +02:00
Howaner
89b1bbdc5f Added beacon. 2014-07-30 21:59:35 +02:00
STRWarrior
6e0a8d393b Moved GetRoofedForestTreeImage content to GetDarkoakTreeImage 2014-07-30 21:56:33 +02:00
STRWarrior
f232ef5cd6 Fixed doxy comment 2014-07-30 21:50:02 +02:00
STRWarrior
fd2d338a25 Fixed comment at the end of a for-loop 2014-07-30 21:42:48 +02:00
STRWarrior
c4e6a14235 Added lighting code and added comments 2014-07-30 19:18:11 +02:00
madmaxoft
0336e12cee MojangAPI: Renamed cache file to MojangAPI.sqlite. 2014-07-30 17:09:41 +02:00
STRWarrior
17b679f355 Fixed compiling using Clang 2014-07-30 17:09:00 +02:00
STRWarrior
5249f574bd Added RoofedForest trees. 
Could still be improved allot.
 2014-07-30 15:55:50 +02:00
madmaxoft
85d64d291a MojangAPI: Clarified the UUID conversion code. 2014-07-30 14:09:30 +02:00
madmaxoft
426773df17 ManualBindings: Fixed alignment. 2014-07-30 14:03:14 +02:00
STRWarrior
5daeba7e88 Removed lighting code in cEnderman::CheckEventSeePlayer 2014-07-30 13:59:47 +02:00
madmaxoft
17a94b16ea MojangAPI: Implemented UUID shortening and dashing. 2014-07-30 13:56:30 +02:00
madmaxoft
6476bd0e2e Exported cMojangAPI to Lua. 2014-07-30 13:56:29 +02:00
madmaxoft
4dd858f899 Added a cMojangAPI class for PlayerName -> UUID lookups, with cache. 
The cache is persisted into a SQLite DB file on server shutdown.
 2014-07-30 13:56:29 +02:00
STRWarrior
75b7c37755 PreSimulator: Added configurations. 
You can now choose if it should pregenerate something or not
 2014-07-30 13:06:48 +02:00
madmaxoft
f095e770b8 Merged branch 'howaner/Options'. 2014-07-30 10:06:18 +02:00
archshift
1d68469718 Fixed "Dependency" typos 2014-07-29 22:43:25 -07:00
Mattes D
b41c8b5de7 Merge pull request #1262 from mc-server/CanBeTerraformed 
Added cBlockInfo::CanBeTerraformed and made finishers use it
 2014-07-30 07:09:33 +02:00
madmaxoft
7022ae7988 Fixed FinishGen.h types. 2014-07-30 07:08:29 +02:00
archshift
487c572429 Entity.h: Moved constants out of some unnamed enum 2014-07-29 19:14:56 -07:00
Howaner
438e4088d6 Changed size_t to 'unsigned long' 2014-07-30 01:22:51 +02:00
Howaner
9a4d80fc3b Fixed compile error with clang. 2014-07-30 00:45:03 +02:00
STRWarrior
931443ac67 Added soulsand to the terraformed list. 2014-07-29 22:40:40 +02:00
STRWarrior
adae2b70b1 Added cBlockInfo::CanBeTerraformed and made finishers use it 
I might have forgotten some of them though
 2014-07-29 22:31:31 +02:00
Tiger Wang
4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Mattes D
30e64ed4d8 Merge pull request #1061 from mc-server/portals 
Portals and others
 2014-07-29 17:48:56 +02:00
Mattes D
d715eb7f5e Merge pull request #1254 from mc-server/SingleTopBlockFinisher 
Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock
 2014-07-29 17:47:40 +02:00
Mattes D
8287f2d933 Merge pull request #1252 from mc-server/RoughRavinesGen 
Rough ravines gen
 2014-07-29 17:46:57 +02:00
Tiger Wang
cb77b39dc6 Detrailed whitespace 2014-07-29 16:36:24 +01:00
STRWarrior
4ccf14f3b3 Some finishing touches 
Removed whitespace
fixed dead bush comment
 2014-07-29 17:01:15 +02:00
Tiger Wang
8811837aea Merge branch 'master' into portals 
Conflicts:
	src/World.h
 2014-07-29 15:27:19 +01:00
STRWarrior
c8c01b055d Fixed comment above cFinishGenSingleTopBlock 2014-07-29 15:24:11 +02:00
STRWarrior
57bb03148a SingleTopBlock: All blocktypes and biometypes get initialized properly 2014-07-29 13:13:23 +02:00
madmaxoft
1acd03f96f Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API. 2014-07-28 17:09:39 +02:00
STRWarrior
e74984675c Using suggestions 2014-07-28 16:53:01 +02:00
STRWarrior
579f850506 Forgot Mesa Plateau biome. 2014-07-28 14:28:16 +02:00
STRWarrior
bf1aa79932 Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock 
Now accepts a vector of biomes and a vector of allowed blocks.
 2014-07-28 14:23:29 +02:00
madmaxoft
f5f9656917 cAuthenticator: Added GetUUIDsFromPlayerNames(). 2014-07-28 12:37:48 +02:00
STRWarrior
5b69b2ce4f DistortedHeightmap: Now generates gravel in deep ocean. 2014-07-28 12:30:16 +02:00
madmaxoft
fd4ee20b2a Hotfixed compilation problems. 2014-07-27 23:15:51 +02:00
Howaner
2bdc2701f4 Change Group->SetColor() again. 2014-07-27 21:58:00 +02:00
Mattes D
0814a977f8 Merge pull request #1236 from Howaner/Inventory2 
Fix item durability.
 2014-07-27 21:39:39 +02:00
Howaner
3d73040327 Use AString(1, Color[0]) 2014-07-27 21:14:45 +02:00
STRWarrior
d61f1d0f4a NetherClumpGenerator: Fixed generating stuff on halfslabs and fences 2014-07-27 20:48:39 +02:00
Howaner
9be92fa71d Use Color[0]. 2014-07-27 20:44:00 +02:00
madmaxoft
579b80fd3a Added a missing include for abs(float). 2014-07-27 20:08:33 +02:00
madmaxoft
003f0e69a9 Updated NetherForts' weights. 2014-07-27 20:04:55 +02:00
madmaxoft
30893e7ee2 RoughRavines: Made floor and ceiling settings-adjustable. 
The world.ini has settings for the minimum and maximum height for each at the ravines' center and edges.
 2014-07-27 19:57:47 +02:00
madmaxoft
960ab982b9 RoughRavines: Added per-height radius modifier. Ledges! 2014-07-27 16:05:45 +02:00
STRWarrior
3addd4890c Removed forgotten comment 2014-07-27 14:04:34 +02:00
STRWarrior
bfad1be567 Made nether ceiling smooth. 2014-07-27 14:03:23 +02:00
madmaxoft
472f70a676 RoughRavines: More settings - size, width, roughness 2014-07-27 13:54:27 +02:00
Howaner
7f9f46c911 Fixed group color's. 2014-07-27 13:47:21 +02:00
STRWarrior
fe7018bd00 Added a ceiling to disguise the bedrock above it. 2014-07-27 13:12:45 +02:00
STRWarrior
50fc1a5469 NetherClumpFoliage: Fixed assert 2014-07-27 11:59:54 +02:00
Howaner
a5cca16abe Add "Broadcasting" settings to world.ini 2014-07-27 00:39:39 +02:00
madmaxoft
ce54936f01 Updated NetherFort prefabs to latest Gallery content. 2014-07-27 00:08:25 +02:00
madmaxoft
77f4297c6e RoughRavines: Initial generator implementation. 
This provides the basic shape of the ravines, with the basic settings based on GridStructGen, and good default values.
 2014-07-27 00:03:26 +02:00
Howaner
f79e682664 Fixed plugin count and fixed plugin loading, when settings.ini was regenerated. 2014-07-27 00:03:00 +02:00
Howaner
c2a2aea9f8 Derp. 2014-07-26 17:09:59 +02:00
Mattes D
56f4174943 Merge pull request #1232 from mc-server/splash-entity 
Moved potion static functions to EntityEffect to create splash potions through the world
 2014-07-26 16:47:11 +02:00
Howaner
6e2025d125 Change comment. 2014-07-26 13:29:25 +02:00
Howaner
ef4d68adfd Merge branch 'master' into Inventory 2014-07-26 13:27:27 +02:00
Howaner
4de8f5ca29 Rename function. 2014-07-26 13:26:14 +02:00
Howaner
ba36e79bc5 Merge branch 'master' into Inventory2 
Conflicts:
	src/BlockInfo.cpp
 2014-07-26 13:23:11 +02:00
archshift
16e0beb5b6 SplashPotionEntity: Use const cItem & instead of a cItem 2014-07-26 03:55:40 -07:00
archshift
60d4a16514 Fixed indentations, removed redundant init code in SplashPotionEntity.cpp 2014-07-26 03:48:16 -07:00
archshift
0298d34406 Moved potion static functions to EntityEffect to create splash potions through world 2014-07-26 03:48:16 -07:00
archshift
1595ef73dc Endianness.h: undefined ntohll before redefining 2014-07-26 03:42:42 -07:00
STRWarrior
a39e19e94a Tweaks to NetherClumpFoliage 
Simplefied the way NetherClupFoliage creates the X and Z coordinate.
 2014-07-25 21:01:40 +02:00
STRWarrior
0f298c8b84 Speed up the NetherClumpFoliage finisher. 
Using IntNoiseXX instead of CubicNoiseXX.
 2014-07-25 14:23:36 +02:00
Tiger Wang
d3012d6904 Merge remote-tracking branch 'origin/master' 2014-07-24 21:38:46 +01:00
Tiger Wang
3a6002de5b Fixed block drops 
* Fixes #1242 (the issue addressed within)
 2014-07-24 21:38:25 +01:00
archshift
4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
madmaxoft
c0b62ef139 Added a queue for setting chunk data. 
Fixes #1196.
 2014-07-24 18:32:05 +02:00
STRWarrior
9678341a11 Made the cWorld::SpawnMobFinalize function more readable. 2014-07-24 12:15:48 +02:00
Tiger Wang
1156914dd6 Suggestions 2014-07-23 21:12:59 +01:00
tonibm19
997a643977 Moar view distance! 
Let's blow up our computers! :D
 2014-07-23 20:28:56 +02:00
Howaner
396739cc0f Fix item durability. 
Fixes #1181
 2014-07-23 16:32:09 +02:00