e034b64a5b
Merge remote-tracking branch 'origin/master' into Ranks
2014-08-22 15:18:39 +02:00
8acc883187
Removed cGroup and cGroupManager.
2014-08-21 15:29:54 +02:00
949aa2f383
cPlayer reads ranks from cRankManager.
2014-08-19 17:34:11 +02:00
e4fc05574b
Player: Silenced a few type conversion warnings.
2014-08-18 22:48:15 +02:00
80559406f9
Player saving creates the "players" folder, if needed.
...
Fixes #1268 .
2014-08-17 22:47:00 +02:00
a68c70c900
Better OnPlayerMoving hook.
2014-08-16 18:44:14 +02:00
a7eb4032ee
Fixed tolua error with static initialization
2014-08-10 17:13:14 -07:00
dba6723611
Player.cpp: change unnamed enum to constant integers
2014-08-10 15:06:59 -07:00
07103ed9d7
Spaces
2014-08-10 21:26:28 +01:00
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
ae61156391
Fixed swing arm animation when you ate.
2014-08-10 17:08:22 +02:00
9ecce2366e
Code reduction and clarity fixes
2014-08-02 22:35:29 -07:00
3ffec92e79
Removed unused cPlayer::FoodPoison function
2014-08-02 22:27:27 -07:00
941a182d8a
Merge pull request #1255 from mc-server/NameToUUID
...
Name to UUID
2014-08-01 22:35:12 +02:00
6d02fce9a2
Merged branch 'master' into NameToUUID.
2014-07-31 23:17:49 +02:00
84462ba8b2
Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.
2014-07-31 23:04:00 +02:00
ecb86935f8
Fixed UUIDs handling in cPlayer.
...
The loading expected dashed UUIDs, MCS uses short UUIDs throughout.
2014-07-31 22:52:06 +02:00
f095e770b8
Merged branch 'howaner/Options'.
2014-07-30 10:06:18 +02:00
4f5d73b770
Slight cleanup after portals
2014-07-29 20:50:30 +01:00
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
a5cca16abe
Add "Broadcasting" settings to world.ini
2014-07-27 00:39:39 +02:00
1156914dd6
Suggestions
2014-07-23 21:12:59 +01:00
396739cc0f
Fix item durability.
...
Fixes #1181
2014-07-23 16:32:09 +02:00
a28b0dc120
Speed improvements, crash fixes, & self-suggestions
2014-07-22 17:26:48 +01:00
3385ed56b8
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
2014-07-22 10:24:28 +01:00
8050a5b98a
Suggestions
2014-07-21 22:49:06 +01:00
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
6be79575fd
Style: Normalized spaces after if, for and while.
2014-07-21 17:38:50 +02:00
6ab9afd0fd
Bug and crash fixes
...
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
2014-07-20 10:46:45 +01:00
d5b163bd3d
Removed references to deprecated cChatColor::Color
2014-07-19 11:12:34 -07:00
08748bafe2
Code style: Fixed braces on separate lines.
2014-07-19 15:23:40 +02:00
041bfd5860
Fixed clamping issues
2014-07-19 01:40:29 -07:00
719551c31f
Fix failed merge and other issues
2014-07-18 20:12:27 +01:00
37140ae578
Merge branch 'master' into portals
...
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
src/ClientHandle.h
src/Entities/Player.cpp
src/Entities/Player.h
src/Generating/FinishGen.cpp
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol16x.cpp
src/Protocol/Protocol16x.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/Root.h
src/World.cpp
2014-07-18 20:10:51 +01:00
ffe44c13d0
Moved ChatColor.h out of defines where it was not needed
2014-07-17 23:25:14 -07:00
bc94ad4b5a
Fixed NULL being passed instead of a double to AddEntityEffect
2014-07-17 14:34:58 -07:00
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +02:00
488ecb6912
Player.cpp: Fixed compile error
2014-07-17 14:08:54 -07:00
5c0789e15e
Player.cpp: Added Wither death message
2014-07-17 14:08:21 -07:00
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
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
7d0fc85d00
Merge branch 'master' into potions
2014-07-17 11:01:26 +02:00
98244e96d1
Merge pull request #1193 from mc-server/deathmessages
...
Death messages
2014-07-17 10:12:22 +02:00
e66b81b395
Merge remote-tracking branch 'origin/master' into potions
2014-07-17 10:06:13 +02:00
174906efca
Another fix for excessive food drain
2014-07-16 22:22:45 +01:00
e444106d09
Merge pull request #1192 from mc-server/skinuuid
...
Skins
2014-07-16 13:30:57 +02:00
8e946da8ac
Merge branch 'master' into potions
2014-07-15 09:01:32 +02:00
4e24f711ab
Player properties are now retrieved
2014-07-14 19:49:31 +01:00
d529971e27
Changed BroadcastSoundEffect function to take floating pos.
2014-07-13 02:08:02 +02:00
Mattes D
Howaner
archshift
Tycho
Tiger Wang