flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
5,432 Commits 1 Branch 0 Tags
a6940445f66948f2dbaa5eaffaa6a89cc15942cb
Commit Graph
143 Commits
Author SHA1 Message Date
Tiger Wang 0d1804e439 Merge branch 'master' into redstoneimprovements 
Conflicts:
	src/ClientHandle.cpp
	src/Entities/FallingBlock.cpp
	src/Mobs/AggressiveMonster.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-05-04 14:15:10 +01:00
madmaxoft 202ce3e737 Fixed MagmaCube spawning. 
Fixes #928.
 2014-05-02 19:17:22 +02:00
Mattes D 709015369d Merge pull request #940 from Howaner/GlobalFixes 
Add entity invulnerable
 2014-04-28 20:58:15 +02:00
Howaner acd2804f31 Revert "Withers now use the new invulnerable." 
This reverts commit 619592b5a0.
 2014-04-28 13:51:40 +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
madmaxoft 9dc9713a9c Fixed warnings. 2014-04-27 23:12:52 +02:00
Tiger Wang bbc5faa723 Redstone simulator now directly accesses cChunk 
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
 2014-04-27 17:35:41 +01: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 477b3e7861 Moved cArrowEntity out of ProjectileEntity.h 2014-04-26 16:45:39 -07:00
archshift e2194e6e90 Added static const, initialized fields. 2014-04-26 15:32:14 -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 619592b5a0 Withers now use the new invulnerable. 2014-04-26 17:37:35 +02:00
Howaner 49f6819829 Fixes 2014-04-26 16:44:15 +02:00
archshift 80b97fd9dd Fixed mobs that don't naturally spawn. 2014-04-25 20:49:55 -07:00
archshift 5ffdaa8142 Moved huge conditional out of InStateChasing(), improving readability 
Squashed a warning.
 2014-04-25 15:49:11 -07:00
Howaner 7e76f030aa Add entity invulnerable 2014-04-26 00:32:30 +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 624deea6c4 Giants! 
Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning.
 2014-04-24 18:11:11 -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
archshift c2f2ef7cb4 Rename mob source files to fit CamelCase. 
Rename Cavespider.cpp to CaveSpider.cpp

Rename Cavespider.h to CaveSpider.h

Rename Magmacube.cpp to MagmaCube.cpp

Rename Magmacube.h to MagmaCube.h

Rename Zombiepigman.cpp to ZombiePigman.cpp

Rename Zombiepigman.h to ZombiePigman.h
 2014-04-23 15:22:49 -07:00
Mattes D 6492aa000b Merge pull request #909 from jfhumann/fixes 
Bug fixes and optimizations.

We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
 2014-04-22 13:34:32 +02: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
Tiger Wang 19358fc7d5 Compilation fix 2014-04-18 20:20:00 +01: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 6cb63a768d Fixed #906 2014-04-18 12:59:14 +01:00
Tiger Wang 200ea6254c Fixed #904 2014-04-18 12:54:17 +01:00
Mattes D b7e074b10b Merge pull request #891 from mc-server/fixes 
Fixes to redstone & general
 2014-04-17 22:37:00 +02:00
Tiger Wang bdea8706d8 Added new AI rules 
+ Added new AI rules handling cacti and large heights
* Fixed cIniFile not recognising comments in cIniFile::ReadFile()
* Fixed users.ini not being properly generated
* Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT
 2014-04-17 18:50:25 +01:00
Tiger Wang c0c47d33c5 Entities handle chunks properly again 
* Entities properly handle chunks
* Changed EntityStatus enums to be less shouty
 2014-04-12 13:16:48 +01:00
Alexander Harkness 9ad87f670b Fixed GitHuB WebEdit fail. 2014-04-10 15:52:00 +01:00
Alexander Harkness 2d02ff1df8 Update Monster.cpp 2014-04-10 15:50:43 +01:00
Mattes D e7b8e17746 Merge pull request #849 from mc-server/minorfixes 
Minor fixes
 2014-04-02 21:26:45 +02:00
Tycho b449ad8613 Merge branch 'MacFixes' 
Conflicts:
	src/DeadlockDetect.cpp
	src/World.cpp
 2014-04-02 06:54:57 -07:00
Tiger Wang ef48b30baa Final realisation of suggestions 2014-03-31 22:37:05 +01:00
Tiger Wang 0836fe9a84 Fixed a few Y too high/low asserts 2014-03-31 20:33:33 +01:00
Samuel Barney eb3cc729d4 More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future. 
Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
 2014-03-25 11:15:05 -06:00
andrew c8445cd934 Fixed clang compilation 2014-03-25 11:40:54 +02:00
andrew ba42166411 Fixed wither summoning 2014-03-25 11:13:27 +02:00
andrew 0fe1e50ffc Protocol: Wither metadata 2014-03-25 10:32:58 +02:00
andrew 4f3377bbbf Minor fixes 2014-03-25 09:10:55 +02:00
andrew 6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
madmaxoft 89027cb675 Fixed double to float conversions. 2014-03-16 22:00:28 +01:00
andrew b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
Tiger Wang c2978a3457 Merge branch 'master' into ballisticmissiles 
Conflicts:
	src/ClientHandle.cpp
 2014-03-09 12:53:50 +00:00