flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
5,752 Commits 1 Branch 0 Tags
d5679f51dedc7998e56f683a876e5b22887a3488
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
madmaxoft 1ff1a93866 Initial Mesa Bryce implementation. 2014-06-10 22:59:45 +02:00
madmaxoft c259dad7b8 Fixed clang warnings about abs() in Noise.cpp. 
MSVC provides a float overload of abs(), clang does not. Using the proper fabs().
 2014-06-10 18:27:17 +02:00
madmaxoft 366ecf9dfd Fixed a race condition when adding a player to a world. 2014-06-10 18:25:53 +02:00
madmaxoft 6c43799cc5 Fixed gcc compilation. 2014-06-10 09:20:32 +02:00
madmaxoft 9ff0ef87d4 Added an experimental height generator, Mountains. 2014-06-09 23:40:51 +02:00
madmaxoft bead36f5ed Added cRidgedMultiNoise, fixed cPerlinNoise. 2014-06-09 23:38:50 +02:00
madmaxoft 2b45e720ad Added Y coord checks and documentation to cBlockDoorHandler. 2014-06-09 21:35:46 +02:00
madmaxoft dcc71a3b7b Merge remote-tracking branch 'howaner/Redstone' 2014-06-09 21:20:26 +02:00
madmaxoft 3a3c42276e docs/Generator: Fixed typo. 2014-06-09 21:18:20 +02:00
madmaxoft 9b5e852f75 Fixed debugging code in tolua++ driver script. 2014-06-09 20:00:17 +02:00
madmaxoft 02b509b81d ToLua can now be run in pure-lua mode. 
See the src/Bindings/AllToLua_lua.bat for usage example.
 2014-06-09 17:05:22 +02:00
madmaxoft 8cfe6c973c docs/Generator: Added SmallFoliage illlustrations. 2014-06-09 01:42:03 +02:00
madmaxoft ec0976f9b0 Fixed a crash when creating negative-size blockareas. 
Now the server emits a warning instead and continues execution.
 2014-06-09 00:49:02 +02:00
Mattes D af4a21ea06 Fixed deadlock when moving players to other worlds. 
Fixes #1039, fixes #851
 2014-06-08 21:58:30 +02:00
Mattes D b904223b9d Added queue for adding entities to cWorld. 
This alone doesn't work properly yet, further changes to cPlayer are needed.
 2014-06-08 21:58:29 +02:00
madmaxoft 28b82d5bbb Proper fix for long interaction. 
Fixes #1078 and #1038.
 2014-06-08 11:32:52 +02:00
Mattes D 9ccdceaadf docs/Generator: fixed grass confusion. 2014-06-07 16:41:18 +02:00
madmaxoft 0544b96f80 docs/Generator: Added the easy Finishers. 2014-06-07 13:59:51 +02:00
madmaxoft ec40c7c83a Added RainbowRoads finisher generator. 2014-06-07 13:59:50 +02:00
Mattes D 87603eb280 Fixed a typo. 2014-06-07 09:19:11 +02:00
madmaxoft 523d29b845 docs/Generator: Added basic terrain composition. 2014-06-05 21:25:47 +02:00
madmaxoft 5fb06e2190 docs/Generator: Added the TerrainHeight section. 2014-06-05 07:30:31 +02:00
Mattes D c11488ccd7 Merge pull request #1011 from SphinxC0re/SomeWarningFixes 
Fixed some warnings
 2014-06-04 18:02:45 +02:00
Mattes D a85d4afe96 Merge pull request #1060 from Howaner/Inventory 
Fix itemframe break.
 2014-06-04 16:08:44 +02:00
madmaxoft b79142c8e7 Fixed buffer overflow in JSON. 
Reported on Coverity as CID 43614.
 2014-06-04 10:47:12 +02:00
madmaxoft 9edd5507d6 docs/Generator: Re-fixed the wording. 2014-06-03 23:45:25 +02:00
madmaxoft c0015d01c6 Player permissions aren't logged to console anymore. 
This was only logspam on most servers and there are alternative ways to list players' permissions.
 2014-06-03 19:50:27 +02:00
madmaxoft 492f99eaeb Merge remote-tracking branch 'howaner/Inventory' 2014-06-03 19:30:01 +02:00
madmaxoft d92520016d Fixed OnProjectileHitBlock bindings. 
Also sorted the various cLuaState::Push() functions.
 2014-06-03 19:29:23 +02:00
madmaxoft 62ea8615b7 docs/Generator: Updated PerlinRivers with better images. 2014-06-03 19:08:48 +02:00
Mattes D 0c5492946b Merge pull request #1028 from mc-server/pistonfixes 
Piston fixes
 2014-06-03 19:02:40 +02:00
madmaxoft aeeb4dc4b0 docs/Generator: Shrunk the hand-drawn images by 50 %. 2014-06-03 18:16:16 +02:00
madmaxoft 9d1475808c Merge branch 'GeneratorArticle' 2014-06-03 14:12:01 +02:00
madmaxoft 49b39f97e0 Generator article: Added TOC with links. 2014-06-03 14:00:50 +02:00
madmaxoft 6f7ac0089f Generator article: fixed bad wording. 2014-06-02 21:56:59 +02:00
Mattes D 60786cb06d Merge pull request #1052 from mc-server/UnderwaterBaseGen 
Underwater base gen
 2014-06-02 21:49:47 +02:00
madmaxoft 345d477849 Generator article: Finished the Biome-gen section and images. 2014-06-02 21:43:07 +02:00
madmaxoft b7dc4177d0 cBlockArea reading hotfix. 
This should fix the crashes introduced with chunksparsing. Not the most performant solution, but at least it should work.
Ref.: #1056
 2014-06-02 14:07:36 +02:00
Mattes D cdddb1aeac AnvilStats: Added new biome colors. 2014-06-01 22:35:29 +02:00
Mattes D 24bea1d0b2 Generator article now has all biome genertors and most their imgs. 2014-06-01 22:33:53 +02:00
madmaxoft 23b0823108 Update UnderwaterBase prefabs. 
Added the waterfall room and the decaying sphere room. Re-tweaked the pieces' weights.
 2014-06-01 22:02:58 +02:00
Mattes D 61edb83ce5 Merge pull request #844 from mc-server/ProjectileHitBlock 
OnProjectileHitBlock tweak.
 2014-06-01 20:10:03 +02:00
Mattes D 869cd7a208 Hot-fixed AnvilStats compilation for MSVC2013. 2014-06-01 15:19:01 +02:00
Mattes D 2059944d1e Merge branch 'master' into GeneratorArticle 2014-06-01 10:43:37 +02:00
madmaxoft 046c149797 Updated UnderwaterBase prefabs. 2014-06-01 10:07:57 +02:00
madmaxoft 75fe89b8ae Updated AlchemistVillage prefabs. 2014-06-01 09:27:54 +02:00
madmaxoft 7672ca7eef Added an initial version of the underwater base generator. 2014-05-31 22:06:14 +02:00
Mattes D 6de45037c7 Merge pull request #1018 from mc-server/VillageGen 
Village gen
 2014-05-31 19:11:13 +02:00
madmaxoft 600c93bdc1 Updated PlainsVillage prefabs. 2014-05-31 10:33:29 +02:00
madmaxoft f4e9c88dcd Fixed a memory leak in VillagGen. 2014-05-31 10:33:12 +02:00
Mattes D 0b758946ac Merge pull request #951 from worktycho/chunksparsing/structs 
Chunksparsing with segments
 2014-05-31 10:12:54 +02:00
madmaxoft b9d306a801 Fixed bindings for cCompositeChat:SetMessageType(). 2014-05-30 22:42:00 +02:00
madmaxoft 8bf7aed67c Updated PlainsVillage and AlchemistVillage. 2014-05-30 22:40:19 +02:00
Mattes D 376d5e7ff0 Initial commit of the Generator article. 2014-05-30 22:31:51 +02:00
Mattes D f2470ff7c1 Reduced the number of cChunkData::CopyBlockTypes() tests, added progress. 2014-05-30 18:32:15 +02:00
Mattes D 76c07b1ec7 Added a cChunkData::CopyBlockTypes() unit test. 2014-05-30 17:44:24 +02:00
madmaxoft e136f6e0f5 Fixed cChunkData nibble copying. 2014-05-30 11:35:29 +02:00
madmaxoft 730e36844e Test failures break into MSVC debugger. 2014-05-30 11:01:13 +02:00
madmaxoft 0b60caac4a Test failures are reported verbosely and into the debug console on Win. 2014-05-30 10:56:12 +02:00
madmaxoft 5368c5dd79 Fixed sign comparison. 2014-05-30 09:49:57 +02:00
madmaxoft 0b49529e42 Fixed test return values. 2014-05-30 09:17:50 +02:00
madmaxoft 0e2138736c Fixed wrong copy sizes in cChunkData. 2014-05-30 09:17:17 +02:00
madmaxoft 8c4dd5dcfd Attempt at fixing an unresolved symbol in gcc / clang. 2014-05-29 21:41:44 +02:00
madmaxoft 59068b77b7 Fixed wrong block sizes for copying / setting. 2014-05-29 20:21:39 +02:00
madmaxoft c5763f3af7 Fixed test compilation. 2014-05-29 19:43:01 +02:00
madmaxoft f7777e8c75 Added comments, reformatted code. 2014-05-29 18:25:08 +02:00
madmaxoft e5187aa645 Fixed a memory leak in cPOCPieceGenerator 2014-05-29 09:19:20 +02:00
madmaxoft b56033d541 Merge remote-tracking branch 'origin/master' into VillageGen 2014-05-29 09:14:47 +02:00
madmaxoft 999662503a Fixed forgotten changes. 2014-05-29 09:09:11 +02:00
madmaxoft 10273f64a2 Fixed a crash in message formatter. 
The code would fail if a message is sent to a player not yet added to a world.
 2014-05-28 22:41:23 +02:00
madmaxoft 81f756cbda cChunkData: Normalized code style. 2014-05-28 22:40:19 +02:00
madmaxoft 7ec44951a0 Fixed cChunkData formatting. 2014-05-28 16:34:25 +02:00
madmaxoft d29b242674 Fixed a memory leak in cPrefabPiecePool. 
The pool pieces weren't freed upon pool destruction.
 2014-05-28 16:33:10 +02:00
madmaxoft dff71823d4 Merge branch 'master' into VillageGen 2014-05-27 22:09:30 +02:00
madmaxoft 6b41d1a422 Added AlchemistVillage prefabs (Thanks, KingsCraftAu). 2014-05-27 22:08:20 +02:00
madmaxoft 71256c98ed Fixed testing weights in PlainsVillages. 2014-05-27 22:06:49 +02:00
madmaxoft ff99373237 cPieceGenerator chooses starting pieces based on weights. 
Fixes #1033.
 2014-05-27 22:05:50 +02:00
madmaxoft 6c25c356c7 Biome generators: biome lists can contain spaces. 2014-05-27 21:18:15 +02:00
Mattes D 2a74e822d5 Merge pull request #1041 from mc-server/fixes 
ClientHandle.cpp: remove redundant code
 2014-05-27 09:37:51 +02:00
madmaxoft 6449b5d11b Revert "Add more move checks" 
This reverts commit 989312c4e7.
 2014-05-26 16:38:39 +02:00
Mattes D 6ad411a8b8 Merge pull request #1003 from Howaner/GlobalFixes 
Add more move checks
 2014-05-26 10:14:05 +02:00
madmaxoft 24137e282b Fixed prefab test initialization. 2014-05-26 10:05:51 +02:00
madmaxoft 1a742a2b52 Added support for Miners' Village. 
The village contains both prefabs that snap to ground and prefabs that connect strictly via connectors.
Fixes #1027.
 2014-05-25 23:50:16 +02:00
Mattes D 0849e66d03 Merge pull request #1013 from mc-server/achievementtranslate 
Proper achievement informing
 2014-05-25 10:42:30 +02:00
madmaxoft 96a22cd82c Added Japanese village prefabs. 2014-05-24 15:03:39 +02:00
Mattes D 4f2db03851 Merge pull request #1022 from mc-server/FixMineshafts 
Fix mineshafts
 2014-05-23 14:00:41 +02:00
Mattes D 97865bff7c Fixed Mineshaft system size. 2014-05-23 13:01:50 +02:00
Mattes D a4c964c888 Auto-enlargement for cGridStructGen cache. 2014-05-23 13:01:06 +02:00
Mattes D 941cb88ae4 Fixed datatype conversion warning. 2014-05-23 12:33:30 +02:00
Mattes D 64dbc45a00 Merge branch 'master' into VillageGen 
* master:
  Fixed profiling flags for MSVC.
  Fixed cWither::KilledBy
  Cleaned up cPlayer::UpdateMovementStats; Wither achievements
  Fixed MCADefrag compilation.
  Derp
  Should have fixed assumptions about entity width.
  Fixed clanging errors.
  Implemented cacti damage
 2014-05-23 11:25:42 +02:00
Mattes D f03cbb5e04 Fixed profiling flags for MSVC. 
The profiler output contained no useful symbols before, because there were no symbols in the PDBs.
 2014-05-23 11:22:48 +02:00
madmaxoft da843a1881 Updated plains village prefabs. 
Expanded the hitboxes so that houses don't touch each other. Fixed minor visual defects.
 2014-05-22 22:19:44 +02:00
madmaxoft 6aa7df367f Villages have min and max density setting. 
Also made roads use 3+9 scheme, instead of 3+5, for the house connectors.

Fixes #1020.
 2014-05-22 21:47:56 +02:00
madmaxoft ebb1ef237a Updated plains village prefabs. 
The DoublePlantBed had sponges in wrong places, plus a few cosmetic fixes.
 2014-05-22 08:57:57 +02:00
madmaxoft 85fc0dbd97 Changed desert village roads to gravel. 2014-05-21 23:17:09 +02:00
madmaxoft efcae77828 Added second kind of desert village (FlatRoof). 2014-05-21 23:16:43 +02:00
madmaxoft 4aec5c9450 Fixed MCADefrag compilation. 2014-05-20 09:37:21 +02:00
madmaxoft e69a11012f Merged branch 'master' into VillageGen. 2014-05-18 23:10:23 +02:00
madmaxoft ec50c0f9e1 Updated SandVillage prefabs to latest Gallery content. 
This fixes sand village generation.
 2014-05-18 23:09:39 +02:00
madmaxoft a651c865e4 There's no "round" function in MSVC2008. 2014-05-18 22:49:27 +02:00