Commit Graph
257 Commits
Author SHA1 Message Date
Howaner d50f8f6f11 Changed the old invulnerable methods from the wither to the new. 2014-04-26 17:47:25 +02:00
Howaner 49f6819829 Fixes 2014-04-26 16:44:15 +02:00
archshift b2f40a7a11 Removed unused assignments. 2014-04-25 18:18:46 -07:00
jfhumann c8d5fcfffa Fix for minor resource leak (CID 43616) 2014-04-26 00:43:01 +02:00
archshift d64e46186f Merge remote-tracking branch 'upstream/master' 2014-04-25 10:50:10 -07:00
archshift e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
archshift 62e5234535 Small changes; warning fixing. 2014-04-24 20:25:03 -07:00
archshift 8fc45c5730 Fixed class capitalization for the cave spider. 2014-04-24 12:18:17 -07:00
archshift 06819595b0 Fixed references to renamed files. 2014-04-23 15:25:10 -07:00
jfhumann 67344a3782 Merge remote-tracking branch 'origin/master' into fixes
Conflicts:
	src/Authenticator.cpp
	src/ClientHandle.cpp
	src/Entities/Minecart.cpp
	src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +02:00
jfhumann 013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Tiger Wang 82b3d543e7 Rewrote redstone powering to use power levels 2014-04-15 13:15:56 +01:00
Tycho 10e72a122c Removed check for enqueuing a chunk that is already enqueued to be loaded
This remaval is safe as cWorldStorage checks for duplicate chunks when dequeuing
and removes an expensive iteration whilst holding the queue lock
2014-04-08 08:43:28 -07:00
madmaxoft 396abb5db6 Fixed silly Clang's warnings in FastNBT. 2014-04-04 10:19:21 +02:00
Tycho b449ad8613 Merge branch 'MacFixes'
Conflicts:
	src/DeadlockDetect.cpp
	src/World.cpp
2014-04-02 06:54:57 -07:00
madmaxoft bcd7f9669b Added schematic string serializer self-test. 2014-04-02 11:56:27 +02:00
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
Samuel Barney 71e9133e49 Added one more missing newline. 2014-03-25 10:34:31 -06: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