Commit Graph
179 Commits
Author SHA1 Message Date
madmaxoft 00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
Mattes D 4293db5eae Merge pull request #1214 from mc-server/anti-glob
CMake - Explicitly lists all source files
2014-07-19 14:29:22 +02:00
archshift f5bcfdc58c Splash potions: Renamed PotionParticleType to PotionColor for clarity 2014-07-19 02:51:39 -07:00
archshift 725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift 465743757a Items/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:42 -07:00
Howaner eeacb6f222 Added a extra wall sign handler.
Fixes #1119
2014-07-18 02:19:30 +02:00
madmaxoft c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft d0cc9aedb3 More trailing whitespace fixes. 2014-07-17 23:16:54 +02:00
madmaxoft 5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft 2423fbf2ef Normalized comments.
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
madmaxoft 64c8b0d51b Reformatted cItemPotionHandler. 2014-07-17 10:51:44 +02:00
madmaxoft e66b81b395 Merge remote-tracking branch 'origin/master' into potions 2014-07-17 10:06:13 +02:00
Tiger Wang 960fcaa90c Fixed a bug with buckets
* Additionally fixed cLineBlockTracer's EntryFace parameter when a block
was hit on the first iteration along the projected line
2014-07-16 22:22:00 +01:00
madmaxoft 8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
Tiger Wang f0187cc8f9 Fixed placing liquids over liquids
* Fixes #1182
2014-07-14 21:55:46 +01:00
archshift 40bb98510a ItemHandler.cpp: removed redundant food and drink checks 2014-07-14 13:46:43 -07:00
archshift 061010288a Readability and clarity changes 2014-07-14 13:46:43 -07:00
Tycho 2a0c041ad8 Adjusted calls to CreateProjectile that passed Items 2014-07-13 15:25:52 +01:00
Howaner d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang 945dfe75d7 Comment grammar correction 2014-07-12 22:52:45 +01:00
Tiger Wang 9f4348fb09 Simplified buckets code slightly 2014-07-12 22:50:28 +01:00
Tiger Wang 084dec6ccf Merge pull request #1162 from daniel0916/Fixes
Fix for bucket placing
2014-07-12 22:09:50 +01:00
daniel0916 68668d7a6e Changes 2014-07-12 12:44:59 +02:00
archshift 4e6395d6ff For now, removed creator member from Entity Effect for pointer safety 2014-07-11 17:27:29 -07:00
daniel0916 ca6bcacdb9 Changes 2014-07-11 17:58:35 +02:00
daniel0916 a8efb62088 Changes 2014-07-10 17:46:07 +02:00
daniel0916 944c04a209 Maybe fixed whitespaces 2014-07-10 16:38:19 +02:00
daniel0916 47ceb9e79d Maybe fixed whitespaces 2014-07-10 16:36:28 +02:00
daniel0916 a11ad977ce Fixed Bucket Placing 2014-07-10 16:10:42 +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 da1d946b2b Fixed bow charge 2014-07-09 22:04:26 +01:00
daniel0916 98950af634 Fixed Bucket placing 2014-07-09 16:53:01 +02:00
Howaner 64e6667435 Only fixes the server crash. 2014-07-01 20:34:50 +02:00
Howaner 64f6ddf1e2 Fix server-crash with non-existing items. 2014-07-01 14:47:49 +02:00
Tiger Wang 61cb08b546 Implemented tripwire(s) (hooks)
* Fixes #944
2014-06-28 20:44:34 +01:00
Howaner eaf36766f6 Merge branch 'master' into Bow 2014-06-26 15:49:53 +02:00
archshift e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
archshift f5529e544c EntityEffects.x -> EntityEffect.x, Object-Oriented effects
Changed effect map to take a pointer of the effect as a result.
2014-06-18 22:54:14 -07:00
archshift 9e8361976b Entity Effects: Clarified user, added it to AddEntityEffect
Added second AddEntityEffect with a pass-by-value of the class.
2014-06-17 11:39:22 -07:00
madmaxoft e289fe4dd7 Changed the AddEntityEffect() params for easier calls. 2014-06-17 11:39:21 -07:00
madmaxoft 045ae2ef2c Fixed MSVC compilation. 2014-06-17 11:39:21 -07:00
archshift 5b2b6e0615 Pawn: renamed HandleEntityEffects to HandleEntityEffect
Exported entity effect functions for ToLua and documented them in APIDesc.lua
2014-06-17 11:39:21 -07:00
archshift 68011a004a Removed long function wrapping 2014-06-17 11:39:20 -07:00
archshift 3766ac96d7 ItemHandler: changed IsDrinkable() to take a short argument 2014-06-17 11:39:20 -07:00
archshift a1a8b7c0ee Splash potion: Adjusted speed, fixed spawn position 2014-06-17 11:39:20 -07:00
archshift 73cea7065d Entity effect type: use 'eff' as a prefix instead of 'ef' 2014-06-17 11:39:20 -07:00
archshift 58f35af6e7 Added splash potion functionality 2014-06-17 11:39:20 -07:00
archshift 2185c72c2c Implemented drinkable potions, noeffect entity effect,
Clears entity effects on death
2014-06-17 11:39:20 -07:00
archshift 1eb04a48ee Implemented milk, added documentation to Pawn.h 2014-06-17 11:39:19 -07:00
archshift 2123173202 Player: Removed food-poisoning-specific code, set duration to 30 seconds
http://minecraft.gamepedia.com/Hunger#Behavior
2014-06-17 11:39:19 -07:00