Commit Graph
419 Commits
Author SHA1 Message Date
madmaxoft e66b81b395 Merge remote-tracking branch 'origin/master' into potions 2014-07-17 10:06:13 +02:00
Tiger Wang 174906efca Another fix for excessive food drain 2014-07-16 22:22:45 +01:00
Mattes D e444106d09 Merge pull request #1192 from mc-server/skinuuid
Skins
2014-07-16 13:30:57 +02:00
madmaxoft cc452f51c8 Restructured cSplashPotionEntity code.
The callback doesn't need declaration in the header.
Renamed PotionName to PotionParticleType.
2014-07-15 22:41:42 +02:00
madmaxoft f5259d7651 Only the cEntityEffect::effXXX constants are Lua-exported.
The rest of the classes don't need exporting, there's no interface using them anyway.
2014-07-15 11:24:48 +02:00
madmaxoft 5193335efa Reformatted EntityEffect code. 2014-07-15 09:48:11 +02:00
madmaxoft d274851578 Fixed a MSVC warning in cEntityEffect::CreateEntityEffect(). 2014-07-15 09:43:45 +02:00
madmaxoft 8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
Tiger Wang ad6494fb36 Maybe improved arrow sinking 2014-07-14 21:56:40 +01:00
archshift 061010288a Readability and clarity changes 2014-07-14 13:46:43 -07:00
Tiger Wang 4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
archshift 0409daf736 EntityEffect: Inlined functions, added explicit copy constructor and operator. 2014-07-13 15:43:49 -07:00
archshift f77723128c Changed separating comment style from asterisks to slashes. 2014-07-13 15:23:23 -07:00
worktychoandTycho 4a6d606f74 Made CreateProjectile a pointer 2014-07-13 15:16:49 +01:00
Howaner d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang 5f72cdac38 Merge pull request #1154 from mc-server/trappedchests
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
archshift 8cbd43e043 Added splash potions to NBT serialization and retrieval 2014-07-11 18:58:11 -07:00
archshift 83c69134c0 Merge remote-tracking branch 'origin/master' into potions 2014-07-11 17:37:28 -07:00
archshift 4e6395d6ff For now, removed creator member from Entity Effect for pointer safety 2014-07-11 17:27:29 -07:00
madmaxoft f73042fb02 Simplified the player data loading. 2014-07-11 23:12:57 +02:00
madmaxoft ebea2b7efc Player data filenames are based on UUID. 2014-07-11 13:13:10 +02:00
madmaxoft 6cea81e383 Fixed a missing return value. 2014-07-11 00:06:58 +02:00
madmaxoft 2bd486660a Preparation for player UUID-based storage: LoadFromFile() 2014-07-11 00:06:05 +02:00
archshift e824cd09b3 Merge remote-tracking branch 'origin/master' into potions
Conflicts:
	src/Entities/Player.cpp
	src/Entities/ProjectileEntity.cpp
2014-07-09 23:28:27 -07:00
Tiger Wang 74b6b398e7 Fixed arrow collection animation
* Fixed piston extension non-solidness
2014-07-09 19:56:50 +01:00
Tiger Wang 372dbbb994 Merge pull request #1135 from mc-server/fixes
Fixes to projectiles and the undead
2014-07-09 09:50:38 +01:00
Tiger Wang 7c7501abc5 Added extra space before comments 2014-07-07 21:14:15 +01:00
Tiger Wang 9e44b0aae1 Implemented trapped chests & others
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
2014-07-06 23:50:22 +01:00
Tiger Wang 460d6bd0cb Changed everything to callbacks 2014-07-05 22:59:22 +01:00
Tiger Wang f4e11d194e Crash and compile fix 2014-07-04 22:07:26 +01:00
Tiger Wang 79e558be34 Suggestions 2014-07-04 17:42:40 +01:00
Tiger Wang f4e3c01a71 Various fixed
* Fixed potential invalid pointer dereferencing, fixes #1117
* Fixed ender pearls not being loaded properly
2014-07-04 16:49:24 +01:00
Tiger Wang f635066241 Eps comparison 2014-07-04 12:50:40 +01:00
Mattes D 39fff19955 Merge pull request #1138 from mc-server/enderchest
Properly implemented enderchests
2014-07-02 22:59:21 +02:00
Tiger Wang 89a26cc786 Suggestions 2014-07-02 21:07:34 +01:00
Tiger Wang abb49d3f33 Suggestion 2014-07-02 18:51:37 +01:00
Tiger Wang f5659a08b8 Merge remote-tracking branch 'origin/master'
Conflicts:
	src/Entities/Player.cpp
2014-07-02 18:48:05 +01:00
Tiger Wang c1ae5513ec Fixed player teleport food drain 2014-07-02 18:46:13 +01:00
Tiger Wang 284c1c0514 Vector clamping fixes
Thank you, @madmaxoft.
2014-07-01 22:39:37 +01:00
Howaner 8e11f7a1f6 Fixes. 2014-06-30 21:50:40 +02:00
Tiger Wang 85fae0e521 Implemented Vector3<>::Floor() 2014-06-30 19:21:21 +01:00
Howaner aa753a92c0 Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGE 2014-06-30 15:12:56 +02:00
Tiger Wang b9d4431f6f Fixed respawning
* Fixes #1103
2014-06-29 22:44:16 +01:00
Tiger Wang 428cfb5c21 Suggestions 2014-06-29 22:41:31 +01:00
Tiger Wang dde641ce83 Properly implemented enderchests 2014-06-29 11:36:38 +01:00
Tiger Wang 536cb62f1c An unification of code style 2014-06-28 21:14:10 +01:00
Tiger Wang 35dc056f03 Likely fixed too quick food depletion
* Fixes FS427 properly, hopefully
2014-06-28 21:10:59 +01:00
Tiger Wang b6df30831d Fixed server forcing players afloat
* Fixes #1131
2014-06-27 23:13:26 +01:00
Mattes D e60b73ce69 Merged branch 'howaner/Bow'.
Removed the pickup collection broadcast due to bad code.
2014-06-26 18:42:28 +02:00
Mattes D 4826990ea0 Merged branch 'howaner/Pickups'. 2014-06-26 18:35:38 +02:00