flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
5,914 Commits 1 Branch 0 Tags 92 MiB
dad0037f98
Commit Graph

5914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
JoannisO
c9c2a4f479 Added Arrow- and FireCharge-Dispensing to DispenserEntity. 2014-05-26 08:44:16 +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
worktycho
d481f9ece3 Merge pull request #1030 from mc-server/betterthan950 
A fix that is better than #950.
 2014-05-25 18:40:32 +01:00
Alexander Harkness
50e29aba77 A fix that is better than #950. 2014-05-25 18:32:42 +01:00
Tycho
2a7d199df6 Fixed bad merge 2014-05-25 18:26:10 +01:00
Tycho
8133efd7f9 Merge branch 'chunksparsing/structs' into AllocationPool 
Conflicts:
	src/ChunkData.cpp
	src/ChunkData.h
	tests/ChunkData/Coordinates.cpp
 2014-05-25 18:02:33 +01:00
Tycho
2591087385 Fixed bug in freeing NULL pointers 2014-05-25 17:48:40 +01:00
Tiger Wang
67308e4337 Fixed a food saturation issue 2014-05-25 13:46:50 +01:00
Tiger Wang
ee929793f0 Hopefully fixed piston duplication issues 
* Fixes #879
* Fixes #714
 2014-05-25 13:46:34 +01:00
Alexander Harkness
882e8e044c Update README.md 2014-05-25 10:21:58 +01:00
Alexander Harkness
34d69bd589 Update README.md 2014-05-25 10:08:26 +01:00
Alexander Harkness
bcdced34ab Update README.md 2014-05-25 10:06:41 +01:00
Alexander Harkness
43eaa573fd Updated the installation instructions in the README. 2014-05-25 10:03:53 +01:00
Mattes D
0849e66d03 Merge pull request #1013 from mc-server/achievementtranslate 
Proper achievement informing
 2014-05-25 10:42:30 +02:00
Tiger Wang
27a9fa3110 Updated Core 2014-05-24 23:28:48 +01:00
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