263ea5464b
Removed last remnant of cGroup.
2014-08-21 15:53:22 +02:00
1b97e4e6ff
cPlayer: Exported the LoadRank function to Lua API.
2014-08-20 20:37:51 +02:00
949aa2f383
cPlayer reads ranks from cRankManager.
2014-08-19 17:34:11 +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
836de13797
Added cPlayer::GetUUID().
2014-08-03 22:04:48 +02: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
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
ba36e79bc5
Merge branch 'master' into Inventory2
...
Conflicts:
src/BlockInfo.cpp
2014-07-26 13:23:11 +02:00
4191be7ddb
Removed redundant semicolons and re-added warning
2014-07-24 11:21:37 -07: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
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
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
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02: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
83c69134c0
Merge remote-tracking branch 'origin/master' into potions
2014-07-11 17:37:28 -07:00
ebea2b7efc
Player data filenames are based on UUID.
2014-07-11 13:13:10 +02:00
2bd486660a
Preparation for player UUID-based storage: LoadFromFile()
2014-07-11 00:06:05 +02:00
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
a0d2df9327
Tailored death messages
2014-07-04 10:55:09 +01:00
39fff19955
Merge pull request #1138 from mc-server/enderchest
...
Properly implemented enderchests
2014-07-02 22:59:21 +02:00
c1ae5513ec
Fixed player teleport food drain
2014-07-02 18:46:13 +01:00
dde641ce83
Properly implemented enderchests
2014-06-29 11:36:38 +01:00
7615ed90c0
Merge branch 'master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Entity.h
src/Entities/Player.h
2014-06-21 22:14:23 +01:00
1296c5dce7
More suggestions
2014-06-21 20:42:29 +01:00
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
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
8eceaf9b0c
Player: made healing instantaneous
2014-06-17 11:39:20 -07:00
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
481f05b011
Entity effects: Added handlers for entity effects
...
Implemented hunger, instant health, damage, poison, regen
Added "template" entity effect implementations
2014-06-17 11:39:19 -07:00
e50423991e
Add bow charging animation
2014-06-16 21:57:23 +02:00
ee50790398
Merge branch 'master' of github.com:mc-server/MCServer
2014-06-16 15:12:50 +01:00
b2fbcaf1bf
Implemented PR suggestions
...
Furnace.txt: newline
BlockID: removed extraneous dimension mapping
cEntity: fixed typo
cPlayer: WorldPtr typedef
2014-06-15 20:27:27 -07:00
29567c5610
Portals animate and delay correctly
2014-06-12 15:21:07 +01:00
bfa8aaf41b
Merge branch 'master' into portals
...
Conflicts:
src/ClientHandle.cpp
src/Entities/Player.cpp
src/Entities/Player.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol17x.cpp
2014-06-10 20:51:22 +01:00
Mattes D
archshift
Howaner
Tiger Wang
Tycho