Commit Graph
171 Commits
Author SHA1 Message Date
madmaxoft b6b86b7270 Fixed warnings in FastNBT. 2014-05-01 22:43:37 +02:00
madmaxoft 772b57ca04 Anvil saver pads data to 4K boundaries.
Fixes #524.
2014-05-01 18:00:10 +02:00
Mattes D 709015369d Merge pull request #940 from Howaner/GlobalFixes
Add entity invulnerable
2014-04-28 20:58:15 +02:00
Howaner 26e935cb20 Revert "Changed the old invulnerable methods from the wither to the new."
This reverts commit d50f8f6f11.
2014-04-28 13:51:22 +02:00
Mattes D c063051645 Merge pull request #954 from mc-server/projectiles-split
Totally refactored ProjectileEntity.h, splitting up into several files.
2014-04-28 12:32:02 +02:00
archshift 9b0cb3fd97 Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
Mattes D a0f6149d05 Merge pull request #948 from jfhumann/staticFixes
Fixes motivated by Coverity #1
2014-04-27 17:00:37 +02:00
archshift cb93a57963 Moved cGhastFireballEntity out of ProjectileEntity.h 2014-04-26 17:41:07 -07:00
archshift de7eaa5735 Moved cFireChargeEntity out of ProjectileEntity.h 2014-04-26 17:35:31 -07:00
archshift 08b77f4880 Moved cThrownSnowballEntity out of ProjectileEntity.h 2014-04-26 17:24:44 -07:00
archshift bc5c28a0be Moved cThrownEnderPearl out of ProjectileEntity.h 2014-04-26 17:08:39 -07:00
archshift de23a115a5 Moved cThrownEggEntity out of ProjectileEntity.h 2014-04-26 17:02:47 -07:00
archshift 477b3e7861 Moved cArrowEntity out of ProjectileEntity.h 2014-04-26 16:45:39 -07:00
archshift aef2c8ec62 Further refactored, Reverted Minecart change
Other small changes.
2014-04-26 09:25:30 -07:00
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
Howanerandmadmaxoft 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