flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
6,841 Commits 1 Branch 0 Tags 92 MiB
7c4cb9a385
Commit Graph

52 Commits

Author SHA1 Message Date
Howaner
47c928cab7 Exported daylight cycle flag to the protocol. 2014-08-11 00:20:28 +02:00
Tiger Wang
3385ed56b8 Merge remote-tracking branch 'origin/master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
 2014-07-22 10:24:28 +01:00
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
Tiger Wang
719551c31f Fix failed merge and other issues 2014-07-18 20:12:27 +01:00
Tiger Wang
37140ae578 Merge branch 'master' into portals 
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
 2014-07-18 20:10:51 +01:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang
b9d4431f6f Fixed respawning 
* Fixes #1103
 2014-06-29 22:44:16 +01:00
Mattes D
9926abd4f5 Added generic entity-collecting. 
Now any cEntity can be collected, not only cPickups.
This should help PR #1098.
 2014-06-27 20:56:44 +02:00
Tiger Wang
29567c5610 Portals animate and delay correctly 2014-06-12 15:21:07 +01:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds. 
Fixes #1039, fixes #851
 2014-06-08 21:58:30 +02:00
andrew
c7c3724a3e Statistic Manager 2014-05-11 14:57:06 +03:00
madmaxoft
eaf3dcb9f7 Fixed connection encryption. 
Fixes #975.
 2014-05-03 23:46:04 +02:00
madmaxoft
ed75d3a836 Fixed warnings in ClientHandle. 2014-05-01 22:58:58 +02:00
madmaxoft
6cb2d2461f Moved the rest of the Crypto objects into their own respective files. 2014-04-29 17:37:15 +02:00
daniel0916
5a9acb7eb6 Merge branch 'master' into Enchanting 2014-04-16 14:31:02 +02:00
madmaxoft
d12d7b6715 Implemented the 1.7.6 protocol and authenticator. 
Server works both in online and offline modes with 1.7.9.
 2014-04-14 22:52:59 +02:00
madmaxoft
0f55dcf036 Initial 1.7.6 protocol support. 
Doesn't work yet because of missing UUIDs.
 2014-04-14 18:52:21 +02:00
daniel0916
2e9754ac1c Merge remote-tracking branch 'upstream/master' into Enchanting 2014-04-07 20:12:17 +02:00
madmaxoft
4be894f060 More Clang warning fixes in the protocols. 2014-04-04 11:47:46 +02:00
madmaxoft
8825d30aab Fixed some Clang warnings in protocols. 2014-04-04 10:13:25 +02:00
Tycho
d33d72f0dc Warnings 2014-03-07 11:04:25 -08:00
andrew
83d3a2eedf Manual merge (Fixed conflicts) 2014-02-20 15:37:15 +02:00
andrew
393ca0221d Map decorators; Map clients 2014-02-18 20:50:08 +02:00
Tiger Wang
320cc74f0a Implemented paintings, fixes #689 
+ Implemented paintings
 2014-02-18 00:16:03 +00:00
madmaxoft
0f1f7583ae Implemented cCompositeChat. 
This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions.
Fixes #678.
 2014-02-15 23:17:49 +01:00
andrew
92e85cc960 Implementation of in-game maps 2014-02-13 17:13:09 +02:00
daniel0916
36120db400 Some updates for enchanting (2) 2014-01-31 19:46:51 +01:00
madmaxoft
bc6fc859f4 Protocol 1.7: Forced encryption on all connections. 
This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication.
 2014-01-28 23:53:54 +01:00
madmaxoft
a2dfb28537 Merged branch 'master' into ChangeToPolarSSL. 2014-01-25 15:37:00 +01:00
madmaxoft
ff066453b8 Comm logging is available in both Debug and Release modes. 2014-01-25 15:28:16 +01:00
madmaxoft
d0da5d392f Added per-connection comm logging in debug mode. 
It is meant for debugging only, so it is compiled only into debug mode. It is activated by starting the server with "/logcomm" parameter.
 2014-01-24 23:03:48 +01:00
daniel0916
bfac00f280 Some updates for enchanting 2014-01-24 20:01:21 +01:00
madmaxoft
5f34c78091 PolarSSL is fully used for 1.3.2 protocol encryption. 2014-01-23 23:35:23 +01:00
andrew
9bd8f74b59 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-01-21 20:40:41 +02:00
andrew
aa61f55b74 Scoreboard protocol support 2014-01-21 15:58:17 +02:00
daniel0916
0c2b307eab first changes for enchanting (not finished) 
- added enchanting table block handler and added it to the blockhandler
- added enchanting window
- drop item in the slot 0 when the player close the window
- added enchanting packet (1.7 only)
- some more...
 2014-01-20 18:22:08 +01:00
Tiger Wang
e4c3d799ff Removed unneeded paramters 2014-01-19 19:42:25 +00:00
Tiger Wang
1af89a8b50 Changed SendBlockEntity format slightly 
* Writing NBT is now in Protocol, not BlockEntity files
* Fixed a last output bug
 2014-01-19 13:25:35 +00:00
Tiger Wang
f8c8dcc7f3 Improved command blocks 
* Their command and previous output are displayed on the client
* They have a BlockHandler implementation, so you can't place blocks on
them anymore
+ As a side effect, implemented UpdateBlockEntity
 2014-01-19 00:54:38 +00:00
madmaxoft
e29749b35e Added packet diagnostics to 1.7 protocol. 
When the packet is mis-interpreted, a log message is output about the packet type and lengths.
 2014-01-16 15:26:58 +01:00
madmaxoft
fe978f0d1e Added cClientHandle::SendPluginMessage(). 
It is not yet exported in the API, though.
 2014-01-09 11:39:42 +01:00
Diusrex
2dbe5033ca Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.h 
I also added a warning(push)/(pop) around crpytlib.cpp because it would go crazy with warnings.

So now, the only warning from cryptopp that is not blocked is 'unreferenced local function has been removed', which also occurs at a single function.
 2014-01-05 15:06:17 -07:00
STRWarrior
e9d1352f6e Implented BroadcastParticleEffect 2013-12-22 14:45:25 +01:00
STRWarrior
37069288d5 Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. 2013-12-14 18:03:00 +01:00
madmaxoft
33c6bcc2f4 Fixed threading issues affecting cProtocol172. 2013-12-13 17:53:26 +01:00
Tiger Wang
30ead79049 Renamed animation function 
Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just
players can have animations, you know.
 2013-12-06 23:47:07 +00:00
Alexander Harkness
d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Alexander Harkness
0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	VC2008/MCServer.vcproj
 2013-11-26 17:21:06 +00:00
Tiger Wang
32449f1fca Further attempts to fix compile 2013-11-25 18:29:36 +00:00
Tiger Wang
e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00