Tiger Wang
|
f55f5ec47f
|
Merge branch 'master' into achievementtranslate
Conflicts:
src/Entities/Player.cpp
|
2014-05-24 23:21:39 +01:00 |
|
Alexander Harkness
|
2eca98a41a
|
Update README.md
|
2014-05-24 22:04:15 +01:00 |
|
Alexander Harkness
|
cc2b84ed9e
|
Update README.md
|
2014-05-24 22:03:31 +01:00 |
|
Alexander Harkness
|
ecb358a36e
|
Update README.md
|
2014-05-24 22:02:19 +01:00 |
|
Alexander Harkness
|
deb69f150d
|
Standardised a badge.
|
2014-05-24 22:00:16 +01:00 |
|
Alexander Harkness
|
0d7dd5fe76
|
Update README.md
|
2014-05-24 21:56:56 +01:00 |
|
Alexander Harkness
|
bd68b71dd7
|
Update README.md
|
2014-05-24 21:55:55 +01:00 |
|
Alexander Harkness
|
078b5f6506
|
Update README.md
|
2014-05-24 21:55:02 +01:00 |
|
Alexander Harkness
|
86086aa357
|
Update README.md
|
2014-05-24 21:49:45 +01:00 |
|
Alexander Harkness
|
bc4d7b3d35
|
Update README.md
|
2014-05-24 21:48:38 +01:00 |
|
Alexander Harkness
|
f3a8560f89
|
Update README.md
|
2014-05-24 21:48:12 +01:00 |
|
Tycho
|
944d29c0ae
|
inject TestGlobals.h correctly
|
2014-05-24 14:09:51 +01:00 |
|
madmaxoft
|
96a22cd82c
|
Added Japanese village prefabs.
|
2014-05-24 15:03:39 +02:00 |
|
Tycho
|
7fac63cffb
|
Moved accessors to cpp file
|
2014-05-24 13:37:25 +01:00 |
|
Tycho
|
8f964886e0
|
Implemented style changes
|
2014-05-24 13:33:40 +01:00 |
|
Tycho
|
4ab8288116
|
Merge branch 'master' into chunksparsing/structs
|
2014-05-24 12:44:49 +01:00 |
|
Tycho
|
8be3a8f7dc
|
Implemented Allocation Pool use by cChunkData
|
2014-05-23 17:18:11 +01:00 |
|
Tycho
|
6991c2dd84
|
Use placement new to initalise objects
|
2014-05-23 15:48:09 +01:00 |
|
Tycho
|
5a76eab4c0
|
Merge branch 'chunksparsing/structs' into AllocationPool
|
2014-05-23 15:02:55 +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 |
|
STRWarrior
|
5e90976cd9
|
Added doxy-comments
|
2014-05-22 17:10:35 +02:00 |
|
STRWarrior
|
592a0b6147
|
cEntity::SetSpeed(a_Vector3d) isn't virtualized anymore
|
2014-05-22 11:46:38 +02:00 |
|
STRWarrior
|
73455d2938
|
cPlayer overrides the SetSpeedXX functions
Fixed compile error
|
2014-05-22 11:08:44 +02:00 |
|
STRWarrior
|
5ef6c8fe72
|
Both SetSpeed functions are now overridden by cPlayer
|
2014-05-22 10:54:07 +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
|
4124eac15d
|
Added callback for stopping starvation mode
|
2014-05-21 21:30:08 +01:00 |
|
Tycho
|
88c61a2e96
|
Fixed reversed comparisons to null
|
2014-05-21 21:18:14 +01:00 |
|
Tycho
|
485752de82
|
Implemented Allocation Pool
|
2014-05-21 20:59:04 +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 |
|