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
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
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
Mattes D
1b97e4e6ff
cPlayer: Exported the LoadRank function to Lua API.
2014-08-20 20:37:51 +02:00
Mattes D
949aa2f383
cPlayer reads ranks from cRankManager.
2014-08-19 17:34:11 +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
madmaxoft
836de13797
Added cPlayer::GetUUID().
2014-08-03 22:04:48 +02:00
madmaxoft
6ce61d1a6f
Fixed a ToLua warning - operator = not supported.
2014-08-03 22:04:48 +02:00
archshift
e461df0030
Entity.cpp: Air timer comment fix
2014-08-03 02:20:48 -07:00
archshift
9ecce2366e
Code reduction and clarity fixes
2014-08-02 22:35:29 -07:00
archshift
3ffec92e79
Removed unused cPlayer::FoodPoison function
2014-08-02 22:27:27 -07:00
archshift
7915c4ca7c
Entity.cpp: On portal check, use if-else for current dimension
...
If current dimension corresponds with the portal (nether portal in the nether) send to the overworld, else send to the portal dimension. No need to switch on the dimension and exclude potential others.
2014-08-02 21:44:02 -07:00
Mattes D
941a182d8a
Merge pull request #1255 from mc-server/NameToUUID
...
Name to UUID
2014-08-01 22:35:12 +02:00
madmaxoft
6d02fce9a2
Merged branch 'master' into NameToUUID.
2014-07-31 23:17:49 +02:00
Howaner
84462ba8b2
Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.
2014-07-31 23:04:00 +02:00
madmaxoft
ecb86935f8
Fixed UUIDs handling in cPlayer.
...
The loading expected dashed UUIDs, MCS uses short UUIDs throughout.
2014-07-31 22:52:06 +02:00
madmaxoft
f095e770b8
Merged branch 'howaner/Options'.
2014-07-30 10:06:18 +02:00
archshift
487c572429
Entity.h: Moved constants out of some unnamed enum
2014-07-29 19:14:56 -07:00
Tiger Wang
4f5d73b770
Slight cleanup after portals
2014-07-29 20:50:30 +01:00
Tiger Wang
cb77b39dc6
Detrailed whitespace
2014-07-29 16:36:24 +01:00
Tiger Wang
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
Mattes D
0814a977f8
Merge pull request #1236 from Howaner/Inventory2
...
Fix item durability.
2014-07-27 21:39:39 +02:00
