flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
7,504 Commits 1 Branch 0 Tags
f8c54f4243049abbcafff1e96f994f742ea9f50d
Commit Graph
625 Commits
Author SHA1 Message Date
Mattes D f8c54f4243 Merged branch 'master' into c++11. 2014-10-23 08:40:39 +02:00
Tiger Wangandarchshift 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
Mattes D bcb839d07b Merged branch 'master' of git://github.com/sriehl/MCServer 2014-10-21 18:12:40 +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
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