flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
5,129 Commits 1 Branch 0 Tags
e47dab84f3f6606d6d6e95774b16d7d4e8d7daa6
Commit Graph
121 Commits
Author SHA1 Message Date
archshift e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -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
andrew 070d483236 cBlockInfo now manages the respective cBlockHandler 2014-03-02 21:25:05 +02:00
Mattes D b17d04737d Merge pull request #738 from xdot/master 
Refactored global block property arrays
 2014-03-02 16:13:43 +01:00
tonibm19 10fdc51b0a Creeper fixes 
- Fixed explosion time (1.5s, according to minecraftwiki)
- Creeper explodes if right clicked with flint and steel
 2014-03-02 14:35:03 +01:00
andrew d73cdba1f6 g_BlockXXX => cBlockInfo::XXX 2014-03-01 21:34:19 +02:00
tonibm19 1de2c23d64 added mooshroom to cow conversion 2014-02-27 22:04:48 +01:00
Tiger Wang a97f28939f Fixed sheep ASSERTing sometimes 2014-02-26 23:33:54 +00:00
Mattes D 23093fd4d1 Merge pull request #710 from TheJumper/master 
Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops
 2014-02-24 18:30:44 +01:00
TheJumper 0b6aa7b370 Fixed Formatting, added compiler warning suppressing methods, fixed comments 2014-02-24 15:38:38 +01:00
TheJumper 2cc597372a Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters 2014-02-23 19:50:51 +01:00
Howaner 5e7f2ba6d6 Add Wolf Heal with Food 2014-02-20 20:41:53 +01:00
Alexander Harkness 72d312ac9b Merge pull request #690 from tonibm19/master 
Now mobs can't escape from fences.
 2014-02-17 16:12:59 +00:00
tonibm19 8707f7ddc8 Improved formatting 2014-02-17 17:01:22 +01:00
Alexander Harkness d47e0b055b Merge pull request #692 from mc-server/wolfcleanup 
Wolf cleanup
 2014-02-17 10:21:38 +00:00
tonibm19 60bcf2807a Now mobs can't escape from fences. 2014-02-16 18:18:07 +01:00
Tiger Wang 2350b77bb5 Fixes to previous commit 2014-02-16 17:08:49 +00:00
Tiger Wang 1a84102b10 Slight cleanup of wolf code 2014-02-16 13:47:55 +00:00
Tiger Wang 8fbb936b63 Fixed TNT fizzing everywhere 2014-02-15 15:53:02 +00:00
Tiger Wang 7ced2f290f Simplified Attack() tracing 2014-02-12 21:53:21 +00:00
Tiger Wang 06239c8336 Fixed #627 
- Attack() is now called from cAggressive instead of cMonster
* Monsters can no longer attack through walls
* Should fix last remnants of player damage after teleporting (that both
STR and bearbin contributed fixes to :P)
 2014-02-11 22:09:56 +00:00
Tiger Wang 9d1c9097e3 Merge remote-tracking branch 'origin/master' into playerimprovements 
Conflicts:
	src/Root.cpp
	src/Root.h
	src/World.cpp
 2014-02-09 00:14:42 +00:00
Tiger Wang f86f066615 Merge branch 'master' into playerimprovements 
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
 2014-02-09 00:04:42 +00:00
Alexander Harkness b9aa0420a3 Merge pull request #646 from worktycho/warningfixes 
Fixed most of the reordering warnings
 2014-02-05 18:24:08 +00:00