madmaxoft
|
b56033d541
|
Merge remote-tracking branch 'origin/master' into VillageGen
|
2014-05-29 09:14:47 +02:00 |
|
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 |
|
worktycho
|
444cce1269
|
Cmake system name not System name
|
2014-05-28 21:39:28 +01:00 |
|
worktycho
|
a2b741d904
|
derp
|
2014-05-28 20:41:34 +01:00 |
|
worktycho
|
1cf426d881
|
FreeBSD requires __POSIX_VISIBLE macro to be defined
|
2014-05-28 20:39:47 +01:00 |
|
worktycho
|
171e13de4f
|
for compiliers other than msvc we need to tell lua that its building as a dll
|
2014-05-28 15:59:59 +01:00 |
|
madmaxoft
|
d29b242674
|
Fixed a memory leak in cPrefabPiecePool.
The pool pieces weren't freed upon pool destruction.
|
2014-05-28 16:33:10 +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 |
|
Alexander Harkness
|
e06f786f11
|
Stuff.
|
2014-05-27 20:24:04 +01:00 |
|
madmaxoft
|
6c25c356c7
|
Biome generators: biome lists can contain spaces.
|
2014-05-27 21:18:15 +02:00 |
|
Mattes D
|
2a74e822d5
|
Merge pull request #1041 from mc-server/fixes
ClientHandle.cpp: remove redundant code
|
2014-05-27 09:37:51 +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 |
|
Alexander Harkness
|
2194238ef0
|
Update main.css
|
2014-05-26 17:17:54 +01:00 |
|
madmaxoft
|
6449b5d11b
|
Revert "Add more move checks"
This reverts commit 989312c4e7.
|
2014-05-26 16:38:39 +02:00 |
|
Alexander Harkness
|
1d6dbb6278
|
Minor fixes.
|
2014-05-26 12:29:45 +01:00 |
|
Alexander Harkness
|
69c3964875
|
Update README.md
|
2014-05-26 10:50:42 +01:00 |
|
Alexander Harkness
|
16e4af0793
|
Update README.md
|
2014-05-26 10:50:17 +01: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 |
|
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 |
|
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 |
|
madmaxoft
|
96a22cd82c
|
Added Japanese village prefabs.
|
2014-05-24 15:03:39 +02: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 |
|