1
0
Commit Graph

5893 Commits

Author SHA1 Message Date
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
Howaner
421588d25d Fix fire break. 2014-05-28 16:59:51 +02:00
Howaner
e7a7c45c36 Add throw sound and fix arrow server crash. 2014-05-28 16:39:59 +02:00
madmaxoft
7ec44951a0 Fixed cChunkData formatting. 2014-05-28 16:34:25 +02: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
Howaner
d4f90259b8 Fix Y-Position from arrow entity. 2014-05-28 16:12:10 +02:00
Howaner
61b6fdde75 Fix right click bugs. 2014-05-28 16:07:51 +02:00
Howaner
d8072da61f Fix skull bugs. 2014-05-28 15:54:43 +02:00
JoannisO
427bddc189 - Removed breaks. I thought it wouldn't compile without them but the
issue was appearantly solved with an earlier commit.
2014-05-28 15:16:45 +02:00
JoannisO
4bc02781af - Fixed an issue where dispensers would only shoot arrows (appearantly
some commits didn't come through)
- Cleaned up the code according to suggestions.
2014-05-28 14:34:33 +02:00
worktycho
5a9e49fbeb Fix cmake errors in msvc 2014-05-28 11:49:36 +01:00
Joannis
e5fd782524 - Implemented vertical dispensing for projectiles.
- Fixed some terrible commit issues on my side.
2014-05-28 09:10:09 +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
Tycho
19df18c461 Fixed test globals to work with precompiled headers 2014-05-27 12:46:22 +01:00
Joannis
1128dc783f - Fixed the ampersands and asterisks to fit the format.
- Fixed the method "SpawnProjectileFromDispenser" to use CamelCasing.
2014-05-27 11:08:06 +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
JoannisO
74801f5647 - Added support for more types of projectiles in the Dispenser
- Improved the method of spawning projectiles in the world
- Added another method for spawning the projectiles
2014-05-26 14:47:04 +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
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