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
Howaner
003206b1b0
Added slowness effect and added entity support.
2014-08-30 12:45:39 +02:00
Jaume Aloy
4900645b28
Added a_Digger check
2014-08-30 00:27:33 +02:00
Tiger Wang
431b7ed0b7
Merge branch 'master' of https://github.com/mc-server/MCServer
...
Conflicts:
src/Server.cpp
2014-08-29 14:56:40 +01:00
Tiger Wang
114b14faad
Removed unused code
2014-08-29 13:44:01 +01:00
Hownaer
240ec9b4bd
Added speed entity effect.
2014-08-28 23:02:20 +02:00
Mattes D
1c136a6047
Fixed a typo.
2014-08-28 17:04:26 +03:00
Mattes D
0cc824d414
Merge pull request #1324 from ChriPiv/master
...
Implement ability to push minecarts on curved rails
2014-08-28 17:01:23 +03:00
Mattes D
8630b20c52
RankMgr: Default rank is applied to players without any rank.
2014-08-24 20:00:45 +02:00
Christophe Piveteau
a56634799e
Change comment formatting
2014-08-24 15:03:02 +02:00
Mattes D
e034b64a5b
Merge remote-tracking branch 'origin/master' into Ranks
2014-08-22 15:18:39 +02:00
Jaume Aloy
7d771953c0
More Enchantments
...
- Added Thorns and Respiration enchantments
2014-08-22 11:49:49 +02:00
Mattes D
263ea5464b
Removed last remnant of cGroup.
2014-08-21 15:53:22 +02:00
Mattes D
8acc883187
Removed cGroup and cGroupManager.
2014-08-21 15:29:54 +02:00
Jaume Aloy
19d1c976e7
Protection Enchantments, some fixes
...
- Protection echantments (fire, blast, feather falling, protection and
projectile). It isn't finished, add secondary effects and optimize the
code.
- Removed some brackets.
- Silk touch fixed.
2014-08-21 12:08:38 +02:00
Mattes D
1b97e4e6ff
cPlayer: Exported the LoadRank function to Lua API.
2014-08-20 20:37:51 +02:00
Jaume Aloy
5008eb8c83
Changed if in BlockHandler
2014-08-19 18:40:42 +02:00
Jaume Aloy
596203e692
Fixes
...
- Changed m_TicksLeftBurning > 0 for IsOnFire()
- Tried to do the changes in BlockHandler.cpp
- Removed m_Creator in ArrowEntity
- Added m_Enchantments in ProjectileEntity CreatorData
- Added blank lines between functions
2014-08-19 17:57:32 +02:00
Mattes D
949aa2f383
cPlayer reads ranks from cRankManager.
2014-08-19 17:34:11 +02:00
Jaume Aloy
07350de514
Changed if for switch
2014-08-19 16:47:33 +02:00
Jaume Aloy
1897f678f9
Added more enchantments and some fixes
...
- Removed Debug messages
- Added Punch enchantment effect
- Added Silk Touch enchantment
- Added Unbreaking enchantment effect
2014-08-19 16:08:17 +02:00
Jaume Aloy
d3fd63c9eb
Added some Enchantments
...
- Bow enchantments: Infinity, Flame and Power
- Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite,
Sharpness
2014-08-19 12:38:15 +02:00
Mattes D
e4fc05574b
Player: Silenced a few type conversion warnings.
2014-08-18 22:48:15 +02:00
Christophe Piveteau
c70886a712
Adjust comment formatting
2014-08-18 01:57:44 +02:00
Mattes D
80559406f9
Player saving creates the "players" folder, if needed.
...
Fixes #1268 .
2014-08-17 22:47:00 +02:00
Howaner
a68c70c900
Better OnPlayerMoving hook.
2014-08-16 18:44:14 +02:00
Christophe Piveteau
72c02ceb17
Added a lot of comments
2014-08-15 17:54:43 +02:00
Christophe Piveteau
c473d8cfb8
Clarify comment message
2014-08-15 14:00:51 +02:00
Christophe Piveteau
be03b84048
End of comment moved away from new line
2014-08-15 13:43:45 +02:00
Christophe Piveteau
0f631febfc
Add some comments
2014-08-15 13:40:56 +02:00
Christophe Piveteau
e3a74f379f
Further changes in coding style
2014-08-14 14:29:46 +02:00
Christophe Piveteau
2d2d4ff33b
Further fixing of coding style errors
2014-08-13 19:47:43 +02:00
Christophe Piveteau
3f117897fb
Another intendation error
2014-08-13 19:18:11 +02:00
Christophe Piveteau
3698c5c829
Fixed braces and intendation errors
2014-08-13 19:16:00 +02:00
Christophe Piveteau
a544c0238b
Implement ability to push minecarts on curved rails
2014-08-13 18:53:23 +02:00
archshift
a7eb4032ee
Fixed tolua error with static initialization
2014-08-10 17:13:14 -07:00
archshift
dba6723611
Player.cpp: change unnamed enum to constant integers
2014-08-10 15:06:59 -07:00
Tycho
07103ed9d7
Spaces
2014-08-10 21:26:28 +01:00
Tycho
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
Howaner
ae61156391
Fixed swing arm animation when you ate.
2014-08-10 17:08:22 +02:00
archshift
beab61bbfe
On destroy ender crystal, create bedrock and fire
2014-08-06 14:16:36 -07:00
madmaxoft
7bfb0b05d0
CheckBasicStyle: multi-level indent change.
2014-08-04 13:20:29 +02:00
Howaner
0911072d27
Attempt to fix knockback and swimming.
2014-08-04 01:34:12 +02:00
madmaxoft
836de13797
Added cPlayer::GetUUID().
2014-08-03 22:04:48 +02:00
madmaxoft
6ce61d1a6f
Fixed a ToLua warning - operator = not supported.
2014-08-03 22:04:48 +02:00
archshift
e461df0030
Entity.cpp: Air timer comment fix
2014-08-03 02:20:48 -07:00
archshift
9ecce2366e
Code reduction and clarity fixes
2014-08-02 22:35:29 -07:00