1
0
Commit Graph

553 Commits

Author SHA1 Message Date
Howaner
1bb4d79412 Added SetCustomName() to players. 2014-09-02 19:12:35 +02:00
Howaner
dfed6f94ca Added name tag 2014-09-01 21:05:45 +02:00
Howaner
7c4cb9a385 Added CustomName to cMonster. 2014-09-01 20:12:56 +02:00
madmaxoft
8821c476bb Fixed previous commit's wrong assumptions.
The equipment-getting functions return a copy already, so we can't take a pointer, really.
2014-09-01 14:35:52 +02:00
madmaxoft
7d8a474f13 Fixed MSVC compilation, improved performance.
We're not creating copies of the equipped items anymore, rather, we're using pointers to them. Also pow() is needlessly slow for a simple second power, and MSVC2008 was confused about the pow() overloads.
2014-09-01 14:31:05 +02:00
madmaxoft
f22f67a63c Fixed MSVC warning. 2014-09-01 14:29:13 +02:00
madmaxoft
9a4e8bf83f Merge remote-tracking branch 'Hircine/Enchantments' 2014-09-01 14:03:39 +02:00
Jaume Aloy
6180f7df09 Fixed style 2014-08-31 11:28:42 +02:00
madmaxoft
26b8471280 Merge branch 'master' into fixes 2014-08-30 22:17:49 +02:00
madmaxoft
b0a7d93ae1 Fixed MSVC2008 compilation.
It was getting confused about which sqrt() overload to call.
2014-08-30 22:11:09 +02:00
Jaume Aloy
4900645b28 Added a_Digger check 2014-08-30 00:27:33 +02:00
Tiger Wang
431b7ed0b7 Merge branch 'master' of https://github.com/mc-server/MCServer
Conflicts:
	src/Server.cpp
2014-08-29 14:56:40 +01:00
Tiger Wang
114b14faad Removed unused code 2014-08-29 13:44:01 +01:00
Mattes D
1c136a6047 Fixed a typo. 2014-08-28 17:04:26 +03:00
Mattes D
0cc824d414 Merge pull request #1324 from ChriPiv/master
Implement ability to push minecarts on curved rails
2014-08-28 17:01:23 +03:00
Mattes D
8630b20c52 RankMgr: Default rank is applied to players without any rank. 2014-08-24 20:00:45 +02:00
Christophe Piveteau
a56634799e Change comment formatting 2014-08-24 15:03:02 +02:00
Mattes D
e034b64a5b Merge remote-tracking branch 'origin/master' into Ranks 2014-08-22 15:18:39 +02:00
Jaume Aloy
7d771953c0 More Enchantments
- Added Thorns and Respiration enchantments
2014-08-22 11:49:49 +02:00
Mattes D
263ea5464b Removed last remnant of cGroup. 2014-08-21 15:53:22 +02:00
Mattes D
8acc883187 Removed cGroup and cGroupManager. 2014-08-21 15:29:54 +02:00
Jaume Aloy
19d1c976e7 Protection Enchantments, some fixes
- Protection echantments (fire, blast, feather falling, protection and
projectile). It isn't finished, add secondary effects and optimize the
code.
- Removed some brackets.
- Silk touch fixed.
2014-08-21 12:08:38 +02:00
Mattes D
1b97e4e6ff cPlayer: Exported the LoadRank function to Lua API. 2014-08-20 20:37:51 +02:00
Jaume Aloy
5008eb8c83 Changed if in BlockHandler 2014-08-19 18:40:42 +02:00
Jaume Aloy
596203e692 Fixes
- Changed m_TicksLeftBurning > 0 for IsOnFire()
- Tried to do the changes in BlockHandler.cpp
- Removed m_Creator in ArrowEntity
- Added m_Enchantments in ProjectileEntity CreatorData
- Added blank lines between functions
2014-08-19 17:57:32 +02:00
Mattes D
949aa2f383 cPlayer reads ranks from cRankManager. 2014-08-19 17:34:11 +02:00
Jaume Aloy
07350de514 Changed if for switch 2014-08-19 16:47:33 +02:00
Jaume Aloy
1897f678f9 Added more enchantments and some fixes
- Removed Debug messages
- Added Punch enchantment effect
- Added Silk Touch enchantment
- Added Unbreaking enchantment effect
2014-08-19 16:08:17 +02:00
Jaume Aloy
d3fd63c9eb Added some Enchantments
- Bow enchantments: Infinity, Flame and Power
- Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite,
Sharpness
2014-08-19 12:38:15 +02:00
Mattes D
e4fc05574b Player: Silenced a few type conversion warnings. 2014-08-18 22:48:15 +02:00
Christophe Piveteau
c70886a712 Adjust comment formatting 2014-08-18 01:57:44 +02:00
Mattes D
80559406f9 Player saving creates the "players" folder, if needed.
Fixes #1268.
2014-08-17 22:47:00 +02:00
Howaner
a68c70c900 Better OnPlayerMoving hook. 2014-08-16 18:44:14 +02:00
Christophe Piveteau
72c02ceb17 Added a lot of comments 2014-08-15 17:54:43 +02:00
Christophe Piveteau
c473d8cfb8 Clarify comment message 2014-08-15 14:00:51 +02:00
Christophe Piveteau
be03b84048 End of comment moved away from new line 2014-08-15 13:43:45 +02:00
Christophe Piveteau
0f631febfc Add some comments 2014-08-15 13:40:56 +02:00
Christophe Piveteau
e3a74f379f Further changes in coding style 2014-08-14 14:29:46 +02:00
Christophe Piveteau
2d2d4ff33b Further fixing of coding style errors 2014-08-13 19:47:43 +02:00
Christophe Piveteau
3f117897fb Another intendation error 2014-08-13 19:18:11 +02:00
Christophe Piveteau
3698c5c829 Fixed braces and intendation errors 2014-08-13 19:16:00 +02:00
Christophe Piveteau
a544c0238b Implement ability to push minecarts on curved rails 2014-08-13 18:53:23 +02:00
archshift
a7eb4032ee Fixed tolua error with static initialization 2014-08-10 17:13:14 -07:00
archshift
dba6723611 Player.cpp: change unnamed enum to constant integers 2014-08-10 15:06:59 -07:00
Tycho
07103ed9d7 Spaces 2014-08-10 21:26:28 +01:00
Tycho
63a07b7ffc Fixed potential crash in Player.cpp
Fixes CID 71780
If ShouldBroadcastDeathMessages is false the pointer would fall through to a check agaist it being a player
2014-08-10 20:47:16 +01:00
Howaner
ae61156391 Fixed swing arm animation when you ate. 2014-08-10 17:08:22 +02:00
archshift
beab61bbfe On destroy ender crystal, create bedrock and fire 2014-08-06 14:16:36 -07:00
madmaxoft
7bfb0b05d0 CheckBasicStyle: multi-level indent change. 2014-08-04 13:20:29 +02:00
Howaner
0911072d27 Attempt to fix knockback and swimming. 2014-08-04 01:34:12 +02:00