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
Tiger Wang
3e74113427
Implemented Chest Minecarts
2014-09-12 23:18:02 +01:00
Tiger Wang
4019847857
Fixed friction being applied whilst airborne
...
Reported by tonibm9 in #1300 .
2014-09-12 20:50:24 +01:00
Howaner
96e03fc3ea
Added extra mushroom handler.
2014-09-12 19:34:19 +02:00
Howaner
1223a24d3c
Merge branch 'master' into Effects
2014-09-12 19:13:46 +02:00
Howaner
c45bf7cf55
1.8: Fixed hangings.
2014-09-11 20:06:28 +02:00
Howaner
f94df06b66
Added the player list to the 1.8 protocol.
2014-09-09 03:02:25 +02:00
Mattes D
9e1f67932b
Fixed player spawning in unknown world.
...
This may happen if the admin removes a world.
2014-09-06 15:26:20 +02:00
Mattes D
6444bc25ba
Fixed security: Player cannot spawn in a disabled world.
2014-09-05 16:55:16 +02:00
archshift
e1206568ec
Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc"
...
This reverts commit 472efa8174
.
Apparently we don't support some of these features quite yet (darn you C++98!)
2014-09-03 16:23:03 -07:00
archshift
472efa8174
Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc
...
Snow Golems must also be above 64Y to spawn snow (as of 1.8).
2014-09-03 16:12:43 -07:00
madmaxoft
1cc65b6264
Fixed style and alpha-sorting.
2014-09-03 10:29:10 +02:00
archshift
b414e91883
EntityEffect.cpp: Enable 1.8's leaping potion
2014-09-02 22:56:39 -07:00
Howaner
38e824dbcf
Renamed SetWalkSpeed() to SetRelativeWalkSpeed()
2014-09-02 20:10:41 +02:00
Howaner
d3b8100a7b
Merge branch 'master' into Effects
2014-09-02 20:03:42 +02:00
Howaner
42dcd534df
Merge branch 'master' into EntityCustomName
2014-09-02 19:36:14 +02:00
Howaner
079634d18c
Added the new functions to APIDump.
2014-09-02 19:20:59 +02:00
Howaner
1bb4d79412
Added SetCustomName() to players.
2014-09-02 19:12:35 +02:00
madmaxoft
b1da567f3d
Pickups combine only within one chunk.
...
This greatly improves performance of the tick thread.
2014-09-01 21:43:03 +02:00
Howaner
dfed6f94ca
Added name tag
2014-09-01 21:05:45 +02:00
Howaner
7c4cb9a385
Added CustomName to cMonster.
2014-09-01 20:12:56 +02:00
madmaxoft
8821c476bb
Fixed previous commit's wrong assumptions.
...
The equipment-getting functions return a copy already, so we can't take a pointer, really.
2014-09-01 14:35:52 +02:00
madmaxoft
7d8a474f13
Fixed MSVC compilation, improved performance.
...
We're not creating copies of the equipped items anymore, rather, we're using pointers to them. Also pow() is needlessly slow for a simple second power, and MSVC2008 was confused about the pow() overloads.
2014-09-01 14:31:05 +02:00
madmaxoft
f22f67a63c
Fixed MSVC warning.
2014-09-01 14:29:13 +02:00
madmaxoft
9a4e8bf83f
Merge remote-tracking branch 'Hircine/Enchantments'
2014-09-01 14:03:39 +02:00
Jaume Aloy
6180f7df09
Fixed style
2014-08-31 11:28:42 +02:00
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
Howaner
0fdb177208
Fixed potion removing in creative mode.
2014-08-30 12:46:26 +02:00