Tycho
|
4ab8288116
|
Merge branch 'master' into chunksparsing/structs
|
2014-05-24 12:44:49 +01:00 |
|
Tycho
|
41692da30c
|
Ignore CTest files
|
2014-05-23 15:01:27 +01: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 |
|
Tycho
|
4b23472097
|
Fixed if spaces
|
2014-05-21 21:46:20 +01:00 |
|
Tycho
|
88c61a2e96
|
Fixed reversed comparisons to null
|
2014-05-21 21:18:14 +01:00 |
|
Tycho
|
93c0dcb1fe
|
Added space to ChunkData.cpp
|
2014-05-21 20:26:43 +01:00 |
|
Tycho
|
bd880603a5
|
Changed cChunkData::SetMeta to return a bool indicating whether the value changed
|
2014-05-21 20:18:09 +01:00 |
|
Tycho
|
5929ffbc40
|
Fixed stylistic issues
|
2014-05-21 20:08:34 +01:00 |
|
Tycho
|
024027db89
|
Renamed cChunkBuffer to cChunkData
|
2014-05-21 19:58:48 +01:00 |
|
Tycho
|
cdd3d11496
|
Fixed minor style issues
|
2014-05-21 18:33:54 +01: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 |
|
madmaxoft
|
4aec5c9450
|
Fixed MCADefrag compilation.
|
2014-05-20 09:37:21 +02: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 |
|
Julian Laubstein
|
7e2effb2d8
|
Changed the m_slotarea position
|
2014-05-19 15:46:36 +02:00 |
|
Alexander Harkness
|
1de4408a18
|
Merge pull request #1010 from mc-server/cactidamage
Implemented cacti damage
|
2014-05-19 14:01:50 +01:00 |
|
Julian Laubstein
|
6687848a7e
|
Fixed warnings in IncrementalRedstoneSimulator
|
2014-05-19 14:49:18 +02:00 |
|
Julian Laubstein
|
fb7f2993bf
|
Fixed some warnings in Server.cpp, and in UI/
|
2014-05-19 14:34:34 +02:00 |
|
Alexander Harkness
|
6de0257bbe
|
Derp
|
2014-05-19 13:31:19 +01:00 |
|
Julian Laubstein
|
e9abf9a498
|
Rolled some changes back
|
2014-05-19 13:02:02 +02:00 |
|
Alexander Harkness
|
dc39d88d3f
|
Should have fixed assumptions about entity width.
@madmaxoft can you comment?
|
2014-05-19 10:35:21 +01:00 |
|
Julian Laubstein
|
cfbb256360
|
Fixed some warnings
|
2014-05-19 10:37:43 +02: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 |
|
Tycho
|
8a0d3f7921
|
Fixed issue with types not being defined for an unused parameter
|
2014-05-18 15:37:17 +01:00 |
|
madmaxoft
|
a7e52e51dc
|
Village roads are drawn properly.
|
2014-05-17 22:26:09 +02:00 |
|