1
0
Commit Graph

140 Commits

Author SHA1 Message Date
madmaxoft
87e0bd54b4 BlockArea: Switched internal coords to Vector3i. 2014-03-25 21:59:41 +01:00
Mattes D
cac5149974 Merge pull request #833 from mc-server/EnderCrystal
Ender crystals
2014-03-25 21:02:23 +01:00
andrew
2e28c09770 Ender crystals 2014-03-25 20:59:33 +02:00
andrew
6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
madmaxoft
9447cd20f3 Fixed a crash in firework rockets.
Fixes #816.
2014-03-17 22:12:02 +01:00
Mattes D
dc77cbfdc4 Merge pull request #809 from Howaner/BlockEntitys
More entity saving.
2014-03-16 21:43:33 +01:00
Howaner
b9fce71bf6 Add new leaves to all classes. 2014-03-16 21:38:57 +01:00
Howaner
4e0edc9fa7 Add anvil direction. 2014-03-16 17:42:23 +01:00
Howaner
d6edd5f24e Remove old debug messages. 2014-03-15 11:53:55 +01:00
Howaner
8316ae330e Merge branch 'master' into BlockEntitys 2014-03-15 02:46:18 +01:00
Howaner
7ac7304c91 Add item frame saving. 2014-03-15 02:45:25 +01:00
Howaner
cf13739288 Add health and age load to pickup's. 2014-03-15 00:43:38 +01:00
Howaner
28898f710b Add ExpOrb saving. 2014-03-15 00:32:49 +01:00
Tycho
862e219443 Added additional macros to support the MSVC size_t format and changed all formats to use the macros 2014-03-12 10:34:50 -07:00
Tycho
d904e89712 Merge branch 'Werror' into warnings
Conflicts:
	src/Globals.h
2014-03-12 10:12:13 -07:00
Tycho
3caa4a38b9 Merge branch 'master' into Werror
Conflicts:
	src/Generating/PieceGenerator.cpp
2014-03-12 09:59:10 -07:00
madmaxoft
f2df33f746 Merge remote-tracking branch 'xdot/master' 2014-03-12 14:42:04 +01:00
Tycho
16b27c4b7a Fixed a load of format string errors 2014-03-11 14:16:08 -07:00
andrew
b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
madmaxoft
950614da7e Renamed cBlockArea Offset to WEOffset.
Even in getters / setters.
2014-03-12 07:46:14 +01:00
madmaxoft
3e9f265a36 Merge branch 'master' into cBlockArea_Offset 2014-03-12 07:39:39 +01:00
STRWarrior
e213e5f9fc Renamed m_Offset to m_WEOffset 2014-03-11 18:23:21 +01:00
Tycho
98e15a34a4 Fixed xofts issues 2014-03-10 13:18:53 -07:00
Tycho
2eca30aebc Removed Some unnessicary macros 2014-03-10 11:34:20 -07:00
Tycho
8947f80294 Use string.reserve to avoid the need to do inplace byteswap 2014-03-10 11:24:12 -07:00
Tycho
cff6631513 Removed unused macro from WSSCompact 2014-03-10 11:14:34 -07:00
Tycho
8864e7d8ca Fixed alignment issues in Fireworks Serializer 2014-03-10 11:13:07 -07:00
Tycho
0a509ab85e Merge branch 'master' into Werror 2014-03-10 10:17:28 -07:00
STRWarrior
0cce0478d8 This allows a blockarea to have an Offset. 2014-03-10 17:07:46 +01:00
madmaxoft
0b9763fc5a Fixed MSVC2008 compilation. 2014-03-10 07:55:47 +01:00
Tiger Wang
09c5542123 Merge pull request #768 from Howaner/BlockEntitys
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tycho
430aba9f1d Its a const not a macro 2014-03-09 10:10:36 -07:00
Tycho
02afa78b68 Take 5 2014-03-09 10:04:07 -07:00
Tycho
167ef3b7a1 Take 4 2014-03-09 09:52:49 -07:00
Tycho
ebf163b77a Unsigned types take 3 2014-03-09 09:45:59 -07:00
Tycho
e73caf30f0 Fix gcc error attempt 2 2014-03-09 09:33:40 -07:00
Tycho
f4201e0b82 Fixed gcc error 2014-03-09 09:25:16 -07:00
Tiger Wang
c2978a3457 Merge branch 'master' into ballisticmissiles
Conflicts:
	src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
Tiger Wang
76bf7ad813 Hexified colours 2014-03-09 12:49:00 +00:00
Tiger Wang
a2fb28dd08 Fixed data length issues 2014-03-09 12:48:59 +00:00
Tiger Wang
124fc8bc66 Demonstrated issues with GetDataLength() 2014-03-09 12:48:58 +00:00
Howaner
527f358510 Merge branch 'master' into BlockEntitys 2014-03-08 12:29:45 +01:00
Howaner
b37966fd21 Change TNT Fuse to ticks 2014-03-08 12:24:33 +01:00
Howaner
f5e374be41 Add TNT Save/Load and add Netbeans projects to .gitignore 2014-03-08 10:25:46 +01:00
madmaxoft
ffdf5f2022 Fixed cBlockArea schematic string saving signature. 2014-03-07 21:28:52 +01:00
Mattes D
f72c747b50 Merge pull request #763 from Howaner/BlockEntitys
Add Flower Pots
2014-03-07 17:54:10 +01:00
madmaxoft
97d803e34f Added cBlockArea serialization to string.
Fixes #665.
2014-03-07 09:17:13 +01:00
Howaner
787a71929c Add Flower Pots 2014-03-07 01:30:34 +01:00
madmaxoft
2998228e85 Added more documentation for FastNBT parser. 2014-03-02 08:22:27 +01:00
andrew
692a84af31 Shortened enums 2014-03-01 14:20:29 +02:00