flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
10,597 Commits 1 Branch 0 Tags 92 MiB
2de6b7537d
Commit Graph

923 Commits

Author SHA1 Message Date
Blitz Rakete
4e0f829729 Fixed leaping potion not giving jump boost 2016-03-18 11:54:28 +01:00
Mattes D
af200dfaae Changed cLuaWindow callbacks to use cLuaState::cCallback. 2016-03-17 19:29:03 +01:00
LogicParrot
83459d0d89 Proper entity destruction in non-ticking chunks 2016-02-19 07:05:22 +02:00
Marvin Kopf
f96903c661 Fix minecart entity collision 
* Minecarts no longer handle a collision if the entity is behind them.
* Minecarts will leave the pushing after a collision on a straight rail to the entity.
 2016-02-16 17:02:05 +01:00
LogicParrot
3efdfca61d remove cWorld::createAndInitializeWorld 2016-02-08 12:17:10 +02:00
LogicParrot
ca6ef58b1e Bulk clearing of whitespace 2016-02-05 23:50:18 +02:00
LogicParrot
4aade202e0 cMonster::m_Target safety across worlds 2016-02-03 22:50:17 +02:00
LogicParrot
a5403c8976 Merge pull request #2941 from LogicParrot/chunkBug2 
[Attempt 2] Fixed cChunk::m_Entities corruption upon world travel
 2016-02-03 20:19:11 +02:00
LogicParrot
07b7fd4ad3 Fixed cChunk::m_Entities corruption upon world travel 2016-02-02 17:55:00 +02:00
Marvin Kopf
a1c48f4853 Fix cPawn pushing 
cPawn instances can no longer push an entity they are attached to. cEntity now has a IsAttachedTo method.
 2016-02-02 14:57:20 +01:00
Mathias
89f3dec7ac Updated old forum links 2016-01-31 02:25:03 +02:00
LogicParrot
439b3304f4 Improved tamed wolf pack cooperation and projectile reactions 2016-01-22 21:16:27 +02:00
LogicParrot
d344e574de Spiders now friendly at daylight, new cChunk functions 2016-01-21 08:21:29 +02:00
LogicParrot
1379b92edf Fixed wrong knockback direction after explosion damage 2016-01-16 18:48:07 +02:00
LogicParrot
8c12227687 Fix crash when tamed wolf is hit by arrows 2016-01-16 16:37:37 +02:00
LogicParrot
5ca2f4fd0c Merge pull request #2875 from LogicParrot/fallDamage 
Fix fall damage crash when tamed wolves neabry
 2016-01-16 11:56:19 +02:00
LogicParrot
0601adba25 Fix fall damage crash when tamed wolves neabry 2016-01-16 11:29:11 +02:00
bibo38
41aa7cf123 Limited the username length to 16 characters. 
This fixes a client crash, because Minecraft requires that a username is not longer than 16 characters.
See also: http://minecraft.gamepedia.com/The_Player#Name
Fixes #2545
 2016-01-13 09:55:48 +01:00
LogicParrot
359e772dee Tamed wolf assists owner (attack / defence) 2016-01-12 11:47:59 +02:00
Mattes D
491dbda7d3 Fixed Clang warnings. 2016-01-06 16:20:12 +01:00
Mattes D
80e1eb37dd Renamed leftover strings to Cuberite / Server, as needed. 
Also upgraded the user setting file for MSVC to 2013.
 2016-01-01 21:05:09 +01:00
Safwat Halaby
400f875918 Freeze player until chunk is loaded 2015-12-25 17:47:06 +02:00
Lukas Pioch
d620dcdd08 Moved variables into scope, removed unused variables and fixed variables 2015-12-17 10:48:36 +01:00
Gargaj
66e6589883 blockheight mechanism 2015-12-13 15:16:15 +01:00
Gargaj
d05fdbdee9 Test for correct coordinates when fishing 
Fun fact: this was able to actually deadlock the server depending on where you were standing :)
 2015-12-10 20:54:55 +01:00
Julian Laubstein
d75ab544f4 Small spelling issues fixed 2015-12-08 21:58:53 +01:00
Gargaj
4132ff495c Spawn chickens from eggs as babies 
This actually works now with the breeding patch (would also close https://github.com/cuberite/cuberite/pull/2366)
 2015-12-05 15:54:34 +01:00
Gargaj
4ae3b64b07 implement breeding 2015-11-29 20:14:28 +01:00
Dave Tucker
83870f9fc0 Add enum for Sound and Particle Effects 
Fixes #2603

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
 2015-11-24 13:21:40 +00:00
samoatesgames
19ea5d5423 Improved spawn location calculations. 
- Supports Overworld and Nether spawns.
 - Supports spawning under objects, but still above ground (e.g. under the leaves of a tree).
 - Protects against spawning in oceans.
 - Protects against spawning in water.
 - Uses a radial search about the origin, rather than a linear.
 - Correctly calculates Nether spawn on spawn world generation (fixes: cuberite#2548)
 - Fixes a bug in CheckPlayerSpawnPoint() where the X offset was used in both the X and Z coords (BLOCKTYPE BlockType = GetBlock(a_PosX + Coords[i].x, a_PosY, a_PosZ + Coords[i].x);)
 2015-11-13 15:08:16 +00:00
Gargaj
5e840cf86f Avoid reading out of bounds 
as per https://github.com/cuberite/cuberite/pull/2630#discussion_r44377411
 2015-11-10 22:22:28 +01:00
Gargaj
67e6da4627 Avoid division by zero 
It won't do much because direction will still be a nullvector, but it at least avoids a CPU spike.
 2015-11-10 18:00:14 +01:00
Gargaj
51f8e0e36c fix shallow water + add future code for liquid fall dampening 2015-11-10 00:36:15 +01:00
Gargaj
ad1e24e50b code style 2015-11-07 13:32:52 +01:00
Gargaj
2f28c2f4ff implement pushing/shoving based on @NiLSPACE's suggestion 2015-11-07 13:29:18 +01:00
Julian Laubstein
056822845d Merge pull request #2593 from cuberite/enderegg 
Destroy an ender crystal when hit by an egg.
 2015-11-05 18:10:19 +01:00
Alexander Harkness
1d4c6d3fbe Destroy an ender crystal, damage a dragon when hit by an egg. 2015-11-05 16:42:42 +00:00
Gargaj
a9579c4f06 Fix being set on fire while directly being under lava 
Right now you will be on fire if there is a block of lava right above you, even if it doesn't pour down.
 2015-11-04 18:00:29 +01:00
bibo38
435bae104d Implemented the Water Breathing Potion functionality. 
Fixes #2556
 2015-11-01 11:50:03 +01:00
bibo38
73b8be0fef Implemented the FireResistence potion effects. 
This not only provides fire resistence, but also prevents blaze fireballs.
See #2556
 2015-10-31 23:06:10 +01:00
Lukas Pioch
5ae19fb332 Debug mode: Fixed assertion, if player below y < 0 2015-10-31 14:26:24 +01:00
OdnetninI
545aa2a989 Spectator Mode doesn't fly[FIX] 2015-10-05 21:59:15 +02:00
Lukas Pioch
e56aa4032d Maked it compileable for clang-3.7 2015-09-25 17:09:19 +02:00
Matti Hänninen
12fb95ba2f Namespace qualify std::abs, use explicit cast 
Without 'std' namespace qualification Clang (at least Apple Clang 6.1)
seems to resolve 'abs' to the 'abs' function in 'cstdlib'.  This in turn
triggers the 'absolute-value' warning which in turn is promoted to
error.

Implicit casts trigger 'old-style-cast' warnings which are promoted to
errors.
 2015-08-22 00:36:29 +03:00
Tiger Wang
de2cce9b79 Fixed food drain bugs 2015-08-20 16:26:42 +01:00
Mattes D
6e4122e551 Unified the doxy-comment format. 2015-07-31 16:49:10 +02:00
Samuel Barney
804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
hallucino
9c85ed5864 Spawn baby mobs 2015-07-16 22:49:55 +02:00
Tiger Wang
c390604bc1 Merge pull request #2349 from cuberite/maps 
Improved maps
 2015-07-15 17:13:55 +01:00
Tiger Wang
8656e149c8 Improved maps 2015-07-14 21:46:30 +01:00
LO1ZB
405458d5e2 Fix food drain on movement. 2015-07-14 20:30:30 +02:00
worktycho
0a7c54261f Merge pull request #2241 from lkolbly/master 
Work on NetherPortalScanner. Setup portal scanner to reset PortalCool…
 2015-06-26 14:12:29 +01:00
Mattes D
4f8e2f180d Added a forgotten break in cHangingEntity constructor. 
This had caused loading the cHangingEntity to fail in debug builds.
 2015-06-24 13:39:11 +02:00
Lane Kolbly
9d620a20a0 Work on NetherPortalScanner. Setup portal scanner to reset PortalCooldown. Changed where player is spawned. Added a_InitSpawn flag to CreateAndInitializeWorld. 2015-06-13 16:09:43 -05:00
Nounours Heureux
d79f601d5a Added HOOK_KILLED 2015-06-13 10:00:31 +02:00
Lane Kolbly
73b6a44d5f Implemented nether portal scanning code. 2015-06-09 18:23:57 -05:00
jan64
d37e0eb72b Added system and above action bar chat messages 2015-06-02 19:59:46 +02:00
Mattes D
48c153bf53 Fixed warnings in MSVC. 
It complained about undefined return values or using uninitialized variables.
 2015-06-02 12:51:43 +02:00
tycho
4956e8700d Merge branch 'master' into PreventNewWarnings 
Conflicts:
	src/Entities/ArrowEntity.cpp
 2015-05-29 00:12:56 +01:00
SafwatHalaby
f1540173da AI - Sane Skeleton 2015-05-28 19:19:56 +03:00
tycho
b2fa71a32a Fix comments 2015-05-28 12:54:04 +01:00
tycho
e19693e529 Merge branch 'master' into PreventNewWarnings 
Conflicts:
	src/Inventory.cpp
 2015-05-28 11:05:41 +01:00
Alexander Harkness
da4a76bb50 Merge pull request #2061 from mc-server/fixes 
Fixes
 2015-05-27 12:21:17 +01:00
tycho
a6ccee5948 Merge branch 'master' into PreventNewWarnings 2015-05-24 17:27:05 +01:00
tycho
dae9e5792a Made -Weverything an error. 2015-05-24 12:56:56 +01:00
Alexander Harkness
febc8529b1 Fix gamemode not changing properly. 
Should fix #604
 2015-05-23 19:31:33 +01:00
tycho
81c0116cf1 Merge branch 'master' into PreventNewWarnings 2015-05-23 07:33:52 -07:00
worktycho
7e0dc0f9bc Merge pull request #2117 from Seadragon91/clang_errors 
Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.
 2015-05-23 15:31:49 +01:00
Lukas Pioch
e30b2ed487 Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. 2015-05-23 16:28:37 +02:00
tycho
b29ae54d91 Merge branch 'master' into PreventNewWarnings 2015-05-23 06:50:28 -07:00
Alexander Harkness
3a27fabbab Merge pull request #2103 from beeduck/Issue1980 
Fixed players head visible when in spectator mode
 2015-05-23 11:56:39 +01:00
tycho
1577a080ee Merge branch 'master' into PreventNewWarnings 2015-05-23 11:31:03 +01:00
Alexander Harkness
31f66fd812 Merge pull request #2104 from beeduck/Issue2053 
Fix for players falling through world when loading in as spectator
 2015-05-23 07:27:04 +01:00
b33duck
afb96c5bd6 Added a fix for players falling through the world when connecting in spectator mode 2015-05-22 16:33:11 -07:00
b33duck
906288c6eb Fixed players head visible when in spectator mode 2015-05-22 12:25:16 -07:00
Lukas Pioch
bc838e5bd2 Renamed hook HOOK_ENTITY_CHANGE_WORLD 2015-05-21 12:27:54 +02:00
tycho
77f1f58c0a Make -Werror disabling file only 
Ad fix a load of warnings
 2015-05-19 19:32:10 +01:00
Lukas Pioch
4d4d1e9c69 Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLD 
Fixes #1435.
 2015-05-18 22:29:39 +02:00
Tiger Wang
0dbba305b6 Fixes #2052 2015-05-18 14:30:16 +01:00
Mattes D
c13b1931ff More style checking. 
Spaces around some operators are checked.
 2015-05-09 12:58:54 +02:00
tycho
448df85e56 Added support for additional data in the ParticleEffect Packet 
Also started refactoring how broadcasts are handled
 2015-05-07 03:47:46 +01:00
Tiger Wang
a509cf00ef Entity improvements 
•Pathfinder improvements
•Fixes #1217
•Fixes #1933

Merge remote-tracking branch 'SafwatHalaby/water2' into fixes
 2015-05-03 23:58:12 +01:00
Mattes D
b5998873e4 cPlayer now checks restrictions. 
Fixes #1331.
 2015-04-25 21:05:43 +02:00
Mattes D
c5ad058424 HangingEntity: Fixed a needless clang warning. 2015-04-19 21:34:56 +02:00
Mattes D
54289aeccb Merge pull request #1844 from DevToaster/master 
Modified physics for more vanilla-like behavior
 2015-04-14 22:31:09 +02:00
STRWarrior
399392195f Fixed players not appearing/disappearing when traveling to a new world. 2015-04-03 18:40:20 +02:00
DevToaster
a9583149b4 Changed air drag for pickups 2015-03-31 11:40:31 -04:00
DevToaster
45c84ea933 Changed air drag units to 'interpolated ticks' per second 2015-03-31 11:03:35 -04:00
DevToaster
d315534b76 Adjusted projectile physics 2015-03-30 20:07:19 -04:00
DevToaster
c743c7fd0c Modified physics for more vanilla-like behavior 2015-03-30 19:42:32 -04:00
Mattes D
e5a7a730ed Merge pull request #1826 from mc-server/UnifyPacketizer 
Unify packetizer
 2015-03-24 13:09:41 +01:00
Mattes D
f1ef7f57ff Merge pull request #1775 from tommysanterre/terrainheightfix 
Correct all world height validations.
 2015-03-23 12:25:22 +01:00
Mattes D
c626848393 Unified cPacketizer across all protocols. 2015-03-22 19:46:08 +01:00
Mattes D
e9b8be25f9 Changed linked world name variables and setters / getters. 
Ref.: #1792
Ref.: https://github.com/mc-server/MCServer/pull/1792#discussion_r25946707
 2015-03-21 15:20:31 +01:00
Mattes D
cc069ccb2a Changed cEntity::m_UniqueID to UInt32. 2015-03-21 15:18:17 +01:00
Mattes D
7e7527cc43 Fixed trailing whitespace. 2015-03-21 14:07:16 +01:00
Tiger Wang
60a52288d8 Improved arrow in-flight and block-hit appearance 
* Fixes #1495
 2015-03-20 22:32:32 +00:00
Tommy Santerre
3f6d823aa4 Correct world height validations. 
Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1).
Allow generation of world of flat height = 255
 2015-03-19 20:32:17 -04:00
Mattes D
0add3d4617 Merge pull request #1810 from mc-server/paintings 
Paintings
 2015-03-15 14:30:23 +01:00
Mattes D
65d2ef32e9 Merge pull request #1734 from mc-server/pistons 
Handle client 'leave bed' request
 2015-03-14 22:44:04 +01:00
Tiger Wang
cb8ea41c90 Fixed style violations 2015-03-13 23:22:09 +00:00
Tiger Wang
3d398baf35 cPainting saving implemented 
Additionally, it now inherits from cHangingEntity.
 2015-03-13 23:05:06 +00:00
Tiger Wang
e15e30a030 Fixed confusion over Item Frame directions 2015-03-13 22:29:27 +00:00
Howaner
a96c21fc0d Merge branch 'master' into Inventory 2015-03-09 22:39:11 +01:00
joshi07
f71b1fe799 Added OnTeleportEntity hook for plugins. 
Plugins may or may not allow teleport to the new position.
Updated the HookNotify plugin with it.
 2015-03-05 11:52:42 +01:00
DevToaster
f5a216cabc Changed C-styled casts to static_cast and removed unneeded casts 2015-03-01 03:45:06 +10:30
DevToaster
e012c06281 Replaced short int with int for Player experience 2015-03-01 03:09:36 +10:30
DevToaster
b65a6ef210 modified: src/Entities/Player.cpp 
modified:   src/Entities/Player.h
 2015-03-01 03:03:41 +10:30
Raekye
378528136c use DoSetSpeed in AddSpeed* in Entity.cpp 2015-02-25 20:56:45 -05:00
Tiger Wang
3869f76cc2 Handle client 'leave bed' request 
* Fixes #1728
 2015-02-08 21:21:48 +00:00
Howaner
ca591c15a0 Spacing 2015-02-07 10:46:01 +01:00
Howaner
7813cd2022 cPlayer should override IsOnGround() 2015-02-07 10:46:01 +01:00
Howaner
9b9ce6fa3b Added IsOnGround() to cEntity 2015-02-07 10:45:45 +01:00
Howaner
2c7925f0ad Merge branch 'master' into Inventory 2015-02-06 21:52:14 +01:00
Mattes D
7dfeb67f01 Converted cServer to use the cNetwork API. 2015-01-27 14:53:31 +01:00
Howaner
1eedccc56a Merge branch 'master' into Inventory 2015-01-25 00:34:19 +01:00
Mattes D
e211aafaa4 Fixed type-conversion warnings. 2015-01-18 11:02:17 +01:00
Tycho
05c40db060 Converted cPickupEntity to std::chrono 2015-01-16 13:56:18 +00:00
Tycho
8dc9cf0c76 Converted MinecartEntity to std::chrono 2015-01-16 13:42:44 +00:00
Tycho
7562a381c0 Converted cExpOrbEntity to std::chrono 2015-01-16 13:27:10 +00:00
Tycho
d6f042da4a Converted ArrowEntityTiers to std::chrono 2015-01-16 13:13:23 +00:00
Tycho
2a9664d6ca Initial convertion of a_Dt to std::chrono 
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
 2015-01-11 21:12:26 +00:00
Mattes D
5609d76ed7 APIDump: Updated the player block placement documentation. 
The hooks now have fewer parameters but are called on all player-placed blocks (#1618).
 2014-12-24 20:02:51 +01:00
Mattes D
63de5f8a55 Replaced a std::hash specialization with explicit type. 
std::hash is problematic in gcc / clang, one has a class, the other a struct.
 2014-12-24 08:38:37 +01:00
Mattes D
ccdf03daaf Refactored all player block placing to go through hooks. 
Fixes #1618.
 2014-12-24 07:20:17 +01:00
Howaner
6ee7fd3c67 Merge branch 'master' into Inventory 2014-12-17 17:33:30 +01:00
gushromp
b9977a39c3 Added braces to 'if' according to the code guidelines 2014-12-15 18:41:47 +01:00
blashyrk
4e5d2c36e9 Updated cPlayer::DoMoveToWorld to send target world's weather info to Player 2014-12-15 17:45:42 +01:00
Howaner
b6fd400276 Own classes for all windows. 2014-12-13 15:06:55 +01:00
Tiger Wang
3acdf25b05 Merge remote-tracking branch 'origin/master' into c++11 
Conflicts:
	src/OSSupport/Thread.cpp
 2014-12-06 17:41:48 +00:00
Mattes D
e2a04f580a BasicStyle: Added missing braces to control statements. 2014-12-05 16:59:11 +01:00
Mattes D
44644ae025 Fixed reported parentheses around comparisons. 2014-12-05 12:58:47 +01:00
Mattes D
c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
Jonathan Fabian
6ca47185c4 Updated whitespace in comment, changed conditional to logical equivalent due to popular demand 2014-12-03 23:04:53 -05:00
Jonathan Fabian
1e6c13ea51 Fix Spaces to Tabs 2014-12-02 20:54:56 -05:00
Jonathan Fabian
24c6da6209 Add missing IsSpectatorMode() checks in Player.cpp, make sure that player is flying when spawned otherwise it will fall through the world. 2014-12-02 20:25:41 -05:00
Mattes D
12ad2a07c0 Minecart.h: Fixed integral conversion warning. 2014-11-27 22:50:18 +01:00
Tiger Wang
79e5b82354 Merge remote-tracking branch 'origin/master' into c++11 
Conflicts:
	src/Noise/Noise.h
	src/World.h
 2014-11-23 17:12:34 +00:00
Tiger Wang
6382989ba0 Compilation fixes 2014-11-23 14:22:05 +00:00
Howaner
8c3c11d6b3 Renamed GetSettedViewDistance() to GetRequestedViewDistance() 2014-11-15 14:27:50 +01:00
Howaner
83d3f3347b Use m_UsedViewDistance and m_SetViewDistance. 2014-11-14 22:53:12 +01:00
Mattes D
765bf006ad Merged branch 'master' into c++11. 2014-10-24 10:19:13 +02:00
Mattes D
190d34e2f7 Merge pull request #1565 from mc-server/MergedIniFile 
Merged ini file
 2014-10-24 09:13:39 +02:00
Mattes D
449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +02:00
Howaner
72bb299a4a Merge branch 'master' into ChunkLoader 
Conflicts:
	src/ChunkSender.cpp
	src/ClientHandle.cpp
	src/World.h
 2014-10-23 14:59:42 +02:00
Mattes D
f8c54f4243 Merged branch 'master' into c++11. 2014-10-23 08:40:39 +02:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Mattes D
b979cad893 cItemFrame: Fixed a forgotten rename. 2014-10-21 22:32:17 +02:00
Mattes D
a42fa071bc Properly exported cItemFrame and cHangingEntity to Lua. 2014-10-21 22:02:30 +02:00
Mattes D
0c0c762412 Exported individual projectile classes to Lua API. 
They used to be exported, but then they were moved to separate files and those werent' added to the ToLua processing list.
 2014-10-21 21:25:52 +02:00
Howaner
6f99615ceb Merge branch 'master' into ChunkLoader 
Conflicts:
	src/World.h
 2014-10-21 21:16:04 +02:00
Mattes D
bcb839d07b Merged branch 'master' of git://github.com/sriehl/MCServer 2014-10-21 18:12:40 +02:00
Howaner
44514e53fc Merge branch 'master' into ChunkLoader 
Conflicts:
	src/ClientHandle.cpp
 2014-10-21 16:55:22 +02:00
Tiger Wang
987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang
bde99d684e Migrated cSleep and cTimer to std::chrono 2014-10-20 18:59:40 +01:00
Mattes D
ebd31ff132 LuaState: Pushing a cEntity pushes the correct class name. 
This makes Lua scripts easier, as they don't need to cast values from cEntity to the specific descendant.
 2014-10-19 11:46:38 +02:00
Tiger Wang
2874bf73be Merge pull request #1502 from mc-server/furnaces 
Improved furnaces
 2014-10-18 21:33:55 +01:00
Tiger Wang
eb821ff240 Fixed failure for cRankManager to restart 2014-10-18 19:55:01 +01:00
Mattes D
eeb580a74e Functions in cPluginManager get references instead of pointers. 2014-10-15 19:09:09 +02:00
Mattes D
1eae7d0ece Fixed style. 2014-10-13 10:34:33 +02:00
Steven Riehl
856764dee8 convert old style casts to fix warnings 2014-10-11 20:39:55 -06:00
archshift
76b37acb42 Float/Ciel: If it's going to use C++11, it might as well take advantage of it 2014-10-09 14:57:57 -07:00
archshift
f8d1e96ae7 Use static casts instead of C casts, add floor-cast functions 2014-10-09 14:57:40 -07:00
Howaner
382e014ebc Optimized chunk loader 2014-10-02 23:50:41 +02:00
madmaxoft
fd11b574bd cPlayer: Removed useless functions from the Lua API. 2014-10-01 17:24:02 +02:00
Mattes D
1531511bbe Merge pull request #1427 from mc-server/chestcarts 
Implemented Chest Minecarts
 2014-09-30 17:16:15 +02:00
Tiger Wang
a9243257e5 Compilation fix 2014-09-28 13:11:41 +01:00
Howaner
2fb3eb3532 cRankManager: Added GetAllPlayers() and GetPlayerName() 2014-09-28 02:17:32 +02:00
Tiger Wang
7ce09a9113 Suggestions 2014-09-27 19:19:28 +01:00
Tiger Wang
d1814d2d67 Merge remote-tracking branch 'origin/master' into chestcarts 
Conflicts:
	src/Entities/Minecart.cpp
 2014-09-27 18:40:00 +01:00
Howaner
af997a09ca Merge branch 'master' into Fixes 2014-09-26 22:23:36 +02:00
Tycho
a3f940f47c Removed more unessicary includes 2014-09-26 18:13:19 +01:00
Howaner
d83d6456e8 Fixed players custom name in 1.8 2014-09-26 17:37:19 +02:00
worktycho
411c69b420 Merge pull request #1419 from mc-server/redstoneTests 
Added test mocking to IncrementalRedstoneSimulator
 2014-09-26 16:04:26 +01:00
Howaner
050b28741b Comment style 2014-09-25 19:28:11 +02:00
Howaner
dd423a2467 Merge branch 'master' into Fixes 2014-09-25 19:22:46 +02:00
Tycho
b2f5ab9678 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-09-25 17:58:12 +01:00
Howaner
daf5127b28 Fixed hanging direction bugs. 2014-09-25 18:37:24 +02:00
madmaxoft
843f31ecba HangingEntity: Silenced a crash. 
Vanilla worlds sometimes contain data that this was asserting upon. Changed into a log.
 2014-09-25 18:36:09 +02:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Mobs/Monster.h
 2014-09-25 15:22:08 +01:00
Howaner
4b38e077cf Merge branch 'master' into EntityCustomName 
Conflicts:
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/World.cpp
	src/World.h
 2014-09-23 14:39:49 +02:00
archshift
5f6bac2091 Made ExpBottleEntity break on entities. 
Fixes #1369
 2014-09-23 00:28:12 -07:00
Chris Darnell
806871b86f A few compiler warning fixes 2014-09-22 18:23:56 -04:00
Alexander Harkness
5f823fd18d Merge pull request #1398 from mc-server/1.8-Protocol 
1.8 Protocol Update
 2014-09-22 20:45:22 +01:00
Chris Darnell
195b646aa4 Made it compile with clang 2014-09-22 03:22:36 -04:00
Howaner
4398156b2e Merge branch 'master' into 1.8-Protocol 2014-09-19 14:31:18 +02:00
Howaner
52c875531e Derp 2014-09-18 18:51:36 +02:00
Howaner
43ed690520 Exported player list states to extra functions. 2014-09-18 18:50:17 +02:00
madmaxoft
95af3eb526 Fixed minor style issues. 2014-09-17 23:32:14 +02:00
nesco
bf85c0b0ab Implementing Spectator Mode 
Adding some proprieties of the spectator game mode in player.cpp :
- Players can't toss items
- Players can't touch the ground
 2014-09-17 21:17:06 +02:00
Tycho
045d54e0e2 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Blocks/ChunkInterface.h
 2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
nesco
c63e14b6d1 Preparing 1.8 update 2014-09-17 17:15:47 +02:00
nesco
89c9aec5da Preparing 1.8 update 
Partially added Spectator gamemode
 2014-09-16 20:17:35 +02:00
nesco
120b23d65e Pre 1.8 release 
Added Spectator gamemode
 2014-09-16 20:04:17 +02:00
nesco
8dedbe4db5 Preparing 1.8 changes 
Added Spectator Gamemode
 2014-09-16 20:02:27 +02:00
Howaner
92e7e5c615 Merge branch 'master' into 1.8-Protocol 2014-09-14 14:16:17 +02:00
Tiger Wang
52d86728e6 Entities experience water resistance 2014-09-13 22:49:05 +01:00
Mattes D
5b63a7fe98 Merge pull request #1353 from mc-server/Effects 
Added speed entity effect.
 2014-09-13 17:05:59 +02:00
Howaner
69afc4dbba Merge branch 'master' into 1.8-Protocol 
Conflicts:
	src/Items/ItemHoe.h
 2014-09-13 01:21:43 +02:00