1
0
Commit Graph

7375 Commits

Author SHA1 Message Date
Howaner
dd423a2467 Merge branch 'master' into Fixes 2014-09-25 19:22:46 +02:00
Howaner
060ac500fc Fixed wrong Surrounding size 2014-09-25 19:19:30 +02:00
Howaner
7cdcf0a883 Anvil: Arrow Tile tags are a short in Vanilla 2014-09-25 19:01:44 +02:00
Tycho
b2f5ab9678 Merge branch 'master' into redstoneTests
Conflicts:
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-09-25 17:58:12 +01:00
Howaner
12621e3800 Use the json writer to write sign texts.
Without this change the client disconnects if the text contains "
2014-09-25 18:49:55 +02:00
Howaner
67fe834499 Fixed dispender direction bug 2014-09-25 18:37:36 +02:00
Howaner
daf5127b28 Fixed hanging direction bugs. 2014-09-25 18:37:24 +02:00
madmaxoft
c6f78d516b Redstone: Fixed a crash with repeaters on a chunk border. 2014-09-25 18:36:11 +02:00
madmaxoft
aeabc4ff6b 1.8 Protocol: Fixed problems with no-payload packets. 2014-09-25 18:36:10 +02:00
madmaxoft
a518a83c25 1.7 Protocol: fixed potential problems with no-payload packets. 2014-09-25 18:36:10 +02:00
madmaxoft
843f31ecba HangingEntity: Silenced a crash.
Vanilla worlds sometimes contain data that this was asserting upon. Changed into a log.
2014-09-25 18:36:09 +02:00
Tycho
799c96661d Fixed style 2014-09-25 15:45:39 +01:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests
Conflicts:
	src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Mattes D
2867672815 Merge pull request #1449 from mc-server/WorldLoader
MCServer world compatiblity with vanilla and mcedit.
2014-09-24 21:15:39 +02:00
Howaner
32ecb121a3 derp 2014-09-24 15:30:52 +02:00
Howaner
1d588b5195 Don't create two entity lists. 2014-09-24 15:17:20 +02:00
Howaner
65077c314a Merge branch 'master' into WorldLoader 2014-09-24 15:00:49 +02:00
madmaxoft
34b83656b3 QtBiomeVisualiser: Fixed MSVC path-crossing.
MSVC would occasionally compile the wrong CPP file - the same name, but wrong path.
2014-09-24 11:21:59 +02:00
madmaxoft
8d9dfc5d1a Anvil: Wolf collar color is a byte in Vanilla.
Kept the old Int reading for compatibility reasons.
Ref.: #1448
2014-09-23 22:22:38 +02:00
Howaner
2832685c02 Merge branch 'master' into WorldLoader 2014-09-23 22:16:05 +02:00
madmaxoft
d04ab9b703 Fixed compiler warnings in 1.8 protocol. 2014-09-23 22:12:48 +02:00
madmaxoft
0b40ce971c Fixed a crash in WSSAnvil.
Reported as #1448.
2014-09-23 22:12:47 +02:00
Howaner
366af5067b MCServer world compatiblity with vanilla and mcedit. 2014-09-23 19:16:17 +02:00
Franz Reiter
33f8091d5f Merge pull request #1372 from mc-server/EntityCustomName
Added SetCustomName() to cMonster and cPlayer
2014-09-23 15:54:07 +02:00
Howaner
b9a5122e29 Fixed SQLiteCpp downgrade 2014-09-23 14:44:15 +02:00
Howaner
4b38e077cf Merge branch 'master' into EntityCustomName
Conflicts:
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/World.cpp
	src/World.h
2014-09-23 14:39:49 +02:00
madmaxoft
de163f0134 QtBiomeVisualiser: Fixed confusion about Globals.h. 2014-09-23 12:51:02 +02:00
archshift
5f6bac2091 Made ExpBottleEntity break on entities.
Fixes #1369
2014-09-23 00:28:12 -07:00
worktycho
e3e7bc21f7 Merge pull request #1447 from cedeel/patch-2
A few compiler warning fixes
2014-09-23 08:15:22 +01:00
Chris Darnell
806871b86f A few compiler warning fixes 2014-09-22 18:23:56 -04:00
Howaner
1aa64f32e1 Updated README.md 2014-09-22 22:07:58 +02:00
Howaner
fc11818f4c Hotfixed 1.8 item reading. 2014-09-22 22:06:08 +02:00
madmaxoft
83588fb0aa QtBiomeVisualiser: Implemented live-update for the generator setup. 2014-09-22 21:52:38 +02:00
madmaxoft
583532e1b9 QtBiomeVisualiser: generator source is read from generator setup ini. 2014-09-22 21:52:37 +02:00
madmaxoft
10c5d50566 QtBiomeVisualiser: Moved the generator setup into a side-pane. 2014-09-22 21:52:37 +02:00
Alexander Harkness
5f823fd18d Merge pull request #1398 from mc-server/1.8-Protocol
1.8 Protocol Update
2014-09-22 20:45:22 +01:00
Howaner
9cddffb6df Changed metadata reading again. 2014-09-22 21:18:13 +02:00
Howaner
bcb11078e3 Fixed item nbt reading. 2014-09-22 17:15:08 +02:00
Alexander Harkness
b9b45e8287 Merge pull request #1446 from cedeel/patch-1
Made it compile with clang
2014-09-22 13:33:41 +01:00
Chris Darnell
195b646aa4 Made it compile with clang 2014-09-22 03:22:36 -04:00
madmaxoft
dda66ea6ef QtBiomeVisualiser: Added the base for INI editting. 2014-09-21 22:58:27 +02:00
Tiger Wang
cb70925077 Fix crash in cLineBlockTracer
* Fixes #1418
2014-09-21 19:24:45 +01:00
madmaxoft
14123c6d16 QtBiomeVisualiser: Added list of vanilla worlds. 2014-09-20 23:03:13 +02:00
madmaxoft
3676a84916 Fixed cParsedNBT::FindTagByPath().
There was an off-by-one error in the name handling.
2014-09-20 23:01:42 +02:00
madmaxoft
66ef05c765 QtBiomeVisualiser: Added support for loading Anvil worlds. 2014-09-20 18:41:21 +02:00
madmaxoft
b2573aad50 Fixed typos in items.ini. 2014-09-19 22:30:32 +02:00
Mattes D
a5386070d6 Merge pull request #1442 from Masy98/Language
Added german language support
2014-09-19 22:28:45 +02:00
Howaner
6aa331a4fa Code improvements. 2014-09-19 15:07:01 +02:00
Howaner
0baca1f1d8 Updated SPAWNING_ENTITY hook description. 2014-09-19 14:36:02 +02:00
Howaner
4398156b2e Merge branch 'master' into 1.8-Protocol 2014-09-19 14:31:18 +02:00