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
|
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 |
|
archshift
|
c204735f38
|
ClientHandle.cpp: Process look before pos
|
2014-05-27 00:28:46 -07:00 |
|
archshift
|
0a3570bc9d
|
ClientHandle.cpp: remove redundant code
HandlePlayerMoveLook() calls HandlePlayerPos() and HandlePlayerLook() to reduce code redundancy.
|
2014-05-26 14:15:32 -07: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 |
|
Alexander Harkness
|
a352ec3895
|
SEMICOLONS!
|
2014-05-25 19:46:16 +01:00 |
|
worktycho
|
6ce73ada6f
|
Update GroupManager.h
|
2014-05-25 19:17:01 +01:00 |
|
Alexander Harkness
|
50e29aba77
|
A fix that is better than #950.
|
2014-05-25 18:32:42 +01:00 |
|
Tiger Wang
|
f55f5ec47f
|
Merge branch 'master' into achievementtranslate
Conflicts:
src/Entities/Player.cpp
|
2014-05-24 23:21:39 +01:00 |
|
madmaxoft
|
96a22cd82c
|
Added Japanese village prefabs.
|
2014-05-24 15:03:39 +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 |
|
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 |
|
Tiger Wang
|
576e17ae08
|
Update CompositeChat.h
|
2014-05-20 22:49:21 +01:00 |
|
andrew
|
07baf9bdd3
|
Cleaned up cPlayer::UpdateMovementStats; Wither achievements
|
2014-05-20 15:52:59 +03:00 |
|
Alexander Harkness
|
507df71845
|
Update Player.cpp
|
2014-05-20 13:35:39 +01:00 |
|
Tiger Wang
|
2bfe962e28
|
Fixed a cactus Y position issue
|
2014-05-19 22:15:39 +01:00 |
|
Tiger Wang
|
4008af6925
|
Simplified cacti conditions
|
2014-05-19 21:17:28 +01:00 |
|
Tiger Wang
|
3a9543178a
|
cCompositeChat message type is now formatted
|
2014-05-19 21:16:29 +01:00 |
|
Tiger Wang
|
42c36429d7
|
Added client translation to achievements
|
2014-05-19 20:40:56 +01: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 |
|
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 |
|