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

268 Commits

Author SHA1 Message Date
Mattes D 7dfeb67f01 Converted cServer to use the cNetwork API. 2015-01-27 14:53:31 +01: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 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
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
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
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
Tiger Wang a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07: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
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
Howaner 382e014ebc Optimized chunk loader 2014-10-02 23:50:41 +02:00
Howaner 2fb3eb3532 cRankManager: Added GetAllPlayers() and GetPlayerName() 2014-09-28 02:17:32 +02:00
Howaner af997a09ca Merge branch 'master' into Fixes 2014-09-26 22:23:36 +02:00
Howaner d83d6456e8 Fixed players custom name in 1.8 2014-09-26 17:37:19 +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
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
Howaner 92e7e5c615 Merge branch 'master' into 1.8-Protocol 2014-09-14 14:16:17 +02: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 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
Howaner d3b8100a7b Merge branch 'master' into Effects 2014-09-02 20:03:42 +02:00
Howaner 1bb4d79412 Added SetCustomName() to players. 2014-09-02 19:12:35 +02:00
madmaxoft 9a4e8bf83f Merge remote-tracking branch 'Hircine/Enchantments' 2014-09-01 14:03:39 +02:00