1
0
Commit Graph

5484 Commits

Author SHA1 Message Date
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
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
madmaxoft
96a22cd82c Added Japanese village prefabs. 2014-05-24 15:03:39 +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
xdot
671c73c639 Merge pull request #1015 from mc-server/Stats
Statistics
2014-05-21 11:14:44 +03:00
andrew
7aeb8ce993 Fixed cWither::KilledBy 2014-05-21 10:59:14 +03:00
andrew
07baf9bdd3 Cleaned up cPlayer::UpdateMovementStats; Wither achievements 2014-05-20 15:52:59 +03:00
madmaxoft
4aec5c9450 Fixed MCADefrag compilation. 2014-05-20 09:37:21 +02:00
Alexander Harkness
1de4408a18 Merge pull request #1010 from mc-server/cactidamage
Implemented cacti damage
2014-05-19 14:01:50 +01:00
Alexander Harkness
6de0257bbe Derp 2014-05-19 13:31:19 +01:00
Alexander Harkness
dc39d88d3f Should have fixed assumptions about entity width.
@madmaxoft can you comment?
2014-05-19 10:35:21 +01:00
Alexander Harkness
70cf4a5eaf Fixed clanging errors.
Please @tigerw make sure this is correct.
2014-05-19 07:31:53 +01:00
Tiger Wang
6167c79e7a Implemented cacti damage
+ Implemented cacti damage
* Fixed pickup tossing (PR #994 bug)
2014-05-18 22:41:42 +01: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
madmaxoft
e09a04a23a Fixed datatype truncation in Diff() template. 2014-05-18 22:36:31 +02:00
Mattes D
ac00568183 Merge pull request #998 from mc-server/StatManager
Statistic Manager
2014-05-18 22:30:34 +02:00
worktycho
16dbad8107 Merge pull request #1005 from SphinxC0re/LoadPluginfolder
Load pluginfolder
2014-05-18 16:48:32 +01:00
Julian Laubstein
40ce737a7e removed the <list> include 2014-05-18 17:30:21 +02:00
Julian Laubstein
cfd3c33dfa Added unload <pluginname> command 2014-05-18 17:16:02 +02:00
madmaxoft
a7e52e51dc Village roads are drawn properly. 2014-05-17 22:26:09 +02:00
madmaxoft
7004043c61 Village houses are height-adjusted onto the terrain. 2014-05-17 21:54:04 +02:00
Julian Laubstein
19f4cd0547 Added load cmd 2014-05-17 19:39:16 +02:00
Julian Laubstein
6951b68aaf Added load command in the cServer class 2014-05-17 18:38:33 +02:00
madmaxoft
fc5c3abcba Updated PlainsVillage prefabs to the latest Gallery contents. 2014-05-17 02:26:44 +02:00
Mattes D
b23baa6f3a Merge pull request #1002 from tonibm19/patch-1
Fixed anvil exp removing
2014-05-16 20:43:16 +02:00
tonibm19
5724dcc2c1 Fixed anvil exp removing 2014-05-16 19:33:57 +02:00
Mattes D
0e43f88668 Merge pull request #994 from Howaner/GlobalFixes
Add place/break radius, add dig cancel packet and add item resend on break/place cancel.
2014-05-15 21:16:04 +02:00
Howaner
28a9c16db2 Fix compile error. 2014-05-15 19:59:52 +02:00
Howaner
6c5ff597bb Move radius check. 2014-05-15 19:58:48 +02:00
madmaxoft
70b0547499 Fixed a NULL ptr failure in GridStructGen.
When the descendant generator returned a NULL structure, the generator would crash. Now it uses a special cEmptyStructure class instead.
2014-05-15 16:03:45 +02:00
madmaxoft
56f7ad2cd9 Changed village generator defaults to more reasonable values. 2014-05-15 10:44:08 +02:00
madmaxoft
34e5f0c164 Changed village road generation to use multiple prefabs. 2014-05-15 10:43:54 +02:00
madmaxoft
f5fdbdaf29 VillageGen rewritten using BFSPieceGenerator.
Piece composition is not good yet, the buildings aren't height-adjusted and the road pieces will need special processing. This is mainly for adjusting the per-piece params.
2014-05-15 00:14:06 +02:00
madmaxoft
3660ce6834 cPrefab can be constructed in code. 2014-05-15 00:12:01 +02:00
andrew
466ff2204f Fixes 2014-05-13 14:53:15 +03:00
Mattes D
0685fb5258 Added doxy-comment requirement 2014-05-13 08:48:33 +02:00
madmaxoft
9c8e8ef7ae VillageGen: Added well placement and the general algorithm description. 2014-05-12 22:43:59 +02:00
andrew
aea866f5b1 Movement Statistics 2014-05-12 21:38:52 +03:00
andrew
b3d2b5b2c9 cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() 2014-05-12 17:05:09 +03:00