flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
8,279 Commits 1 Branch 0 Tags 92 MiB
cb8ea41c90
Commit Graph

672 Commits

Author SHA1 Message Date
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
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