worktycho
|
e10940d57c
|
Fixed compile
|
2014-06-12 17:24:14 +01:00 |
|
Tiger Wang
|
29567c5610
|
Portals animate and delay correctly
|
2014-06-12 15:21:07 +01:00 |
|
Tiger Wang
|
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 |
|
Tiger Wang
|
35b79e5d71
|
Portal improvements and suggestions
|
2014-06-10 20:43:27 +01:00 |
|
Mattes D
|
af4a21ea06
|
Fixed deadlock when moving players to other worlds.
Fixes #1039, fixes #851
|
2014-06-08 21:58:30 +02:00 |
|
Mattes D
|
b904223b9d
|
Added queue for adding entities to cWorld.
This alone doesn't work properly yet, further changes to cPlayer are needed.
|
2014-06-08 21:58:29 +02:00 |
|
Tiger Wang
|
f22a1b226c
|
Fixed compilation
|
2014-06-05 08:25:26 +01:00 |
|
Tiger Wang
|
873043c8e4
|
Suggestions
|
2014-06-04 21:51:19 +01:00 |
|
Tiger Wang
|
ccbf6cc446
|
Configurable portals
|
2014-06-04 20:00:55 +01:00 |
|
Tiger Wang
|
74cd4f5521
|
Suggestions
|
2014-06-04 18:59:56 +01:00 |
|
Howaner
|
33fbdedea3
|
Fix itemframe break.
|
2014-06-04 15:16:30 +02:00 |
|
Tiger Wang
|
01f38d8836
|
Added checks for no downfall biomes
|
2014-06-04 13:22:50 +01:00 |
|
Tiger Wang
|
86e5273cd1
|
Merge remote-tracking branch 'origin/master' into portals
|
2014-06-04 13:14:38 +01:00 |
|
madmaxoft
|
c0015d01c6
|
Player permissions aren't logged to console anymore.
This was only logspam on most servers and there are alternative ways to list players' permissions.
|
2014-06-03 19:50:27 +02:00 |
|
Mattes D
|
61edb83ce5
|
Merge pull request #844 from mc-server/ProjectileHitBlock
OnProjectileHitBlock tweak.
|
2014-06-01 20:10:03 +02:00 |
|
Tiger Wang
|
576f89c1d5
|
Implemented bed homes
+ Implemented bed home positions
* Fixed some inventory and health server/client mismatches after world
change
|
2014-06-01 18:46:59 +01:00 |
|
Tiger Wang
|
8bff3e5af2
|
Implemented end and nether portals
|
2014-05-31 22:28:51 +01:00 |
|
STRWarrior
|
d1b23060ad
|
Used recommendations
|
2014-05-31 14:14:55 +02:00 |
|
Mattes D
|
0b758946ac
|
Merge pull request #951 from worktycho/chunksparsing/structs
Chunksparsing with segments
|
2014-05-31 10:12:54 +02:00 |
|
Tiger Wang
|
f55f5ec47f
|
Merge branch 'master' into achievementtranslate
Conflicts:
src/Entities/Player.cpp
|
2014-05-24 23:21:39 +01:00 |
|
Tycho
|
4ab8288116
|
Merge branch 'master' into chunksparsing/structs
|
2014-05-24 12:44:49 +01:00 |
|
Mattes D
|
941cb88ae4
|
Fixed datatype conversion warning.
|
2014-05-23 12:33:30 +02:00 |
|
xdot
|
671c73c639
|
Merge pull request #1015 from mc-server/Stats
Statistics
|
2014-05-21 11:14:44 +03:00 |
|
andrew
|
07baf9bdd3
|
Cleaned up cPlayer::UpdateMovementStats; Wither achievements
|
2014-05-20 15:52:59 +03:00 |
|
Alexander Harkness
|
507df71845
|
Update Player.cpp
|
2014-05-20 13:35:39 +01:00 |
|
Tiger Wang
|
2bfe962e28
|
Fixed a cactus Y position issue
|
2014-05-19 22:15:39 +01:00 |
|
Tiger Wang
|
4008af6925
|
Simplified cacti conditions
|
2014-05-19 21:17:28 +01:00 |
|
Tiger Wang
|
42c36429d7
|
Added client translation to achievements
|
2014-05-19 20:40:56 +01:00 |
|
Alexander Harkness
|
1de4408a18
|
Merge pull request #1010 from mc-server/cactidamage
Implemented cacti damage
|
2014-05-19 14:01:50 +01:00 |
|
Alexander Harkness
|
6de0257bbe
|
Derp
|
2014-05-19 13:31:19 +01:00 |
|
Alexander Harkness
|
dc39d88d3f
|
Should have fixed assumptions about entity width.
@madmaxoft can you comment?
|
2014-05-19 10:35:21 +01:00 |
|
Alexander Harkness
|
70cf4a5eaf
|
Fixed clanging errors.
Please @tigerw make sure this is correct.
|
2014-05-19 07:31:53 +01:00 |
|
Tiger Wang
|
6167c79e7a
|
Implemented cacti damage
+ Implemented cacti damage
* Fixed pickup tossing (PR #994 bug)
|
2014-05-18 22:41:42 +01:00 |
|
madmaxoft
|
a651c865e4
|
There's no "round" function in MSVC2008.
|
2014-05-18 22:49:27 +02:00 |
|
andrew
|
466ff2204f
|
Fixes
|
2014-05-13 14:53:15 +03:00 |
|
andrew
|
aea866f5b1
|
Movement Statistics
|
2014-05-12 21:38:52 +03:00 |
|
andrew
|
b3d2b5b2c9
|
cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()
|
2014-05-12 17:05:09 +03:00 |
|
andrew
|
6cb3483954
|
Fixed compilation
|
2014-05-11 21:41:25 +03:00 |
|
andrew
|
e3c6c8f3dd
|
Fixed stat serialization
|
2014-05-11 20:30:54 +03:00 |
|
andrew
|
c7c3724a3e
|
Statistic Manager
|
2014-05-11 14:57:06 +03:00 |
|
Tycho
|
d478e3cfb1
|
Merge branch 'master' into chunksparsing/structs
Conflicts:
src/Chunk.h
|
2014-05-10 05:05:44 -07:00 |
|
worktycho
|
17c7c31130
|
Initialise m_HasTeleported in both constructors
|
2014-05-09 16:56:29 +01:00 |
|
Tiger Wang
|
696a7bc52e
|
Merge branch 'master' into fixes
Conflicts:
src/Vector3.h
|
2014-05-06 20:15:19 +01:00 |
|
Tiger Wang
|
cca8376a01
|
Suggestions'd #2
|
2014-05-06 19:38:01 +01:00 |
|
Tiger Wang
|
1df7dbe7c9
|
Suggestions'd
|
2014-05-05 23:45:35 +01:00 |
|
Tiger Wang
|
0d1804e439
|
Merge branch 'master' into redstoneimprovements
Conflicts:
src/ClientHandle.cpp
src/Entities/FallingBlock.cpp
src/Mobs/AggressiveMonster.cpp
src/Simulator/IncrementalRedstoneSimulator.cpp
|
2014-05-04 14:15:10 +01:00 |
|
madmaxoft
|
5082d55e85
|
A bit of reformatting.
|
2014-05-02 19:40:12 +02:00 |
|
madmaxoft
|
839447f0bb
|
Merge branch 'master' into fixes.
|
2014-05-02 19:34:28 +02:00 |
|
Tycho
|
8780b324ff
|
Merge branch 'master' into chunksparsing/structs
|
2014-05-01 11:50:40 -07:00 |
|
madmaxoft
|
dffd38e53b
|
Fixed a MSVC warning.
|
2014-04-28 22:21:49 +02:00 |
|