flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
10,846 Commits 1 Branch 0 Tags
c1e9d9d0e007a40f0913b83df0c5d33dbef3d97e
Commit Graph
561 Commits
Author SHA1 Message Date
madmaxoft 2423fbf2ef Normalized comments. 
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
 2014-07-17 22:15:34 +02:00
Mattes D e444106d09 Merge pull request #1192 from mc-server/skinuuid 
Skins
 2014-07-16 13:30:57 +02:00
Tiger Wang c5d00f3ec5 Suggestions 2014-07-16 12:05:09 +01:00
Tiger Wang ad247735fd Function rename 2014-07-16 11:23:26 +01:00
Tiger Wang f2c4f56ccd Unified functions 
Thanks @Howaner!
 2014-07-16 11:21:02 +01:00
Tiger Wang 1f6854792c Store properties as Json::Value 2014-07-16 00:03:47 +01:00
Tiger Wang 4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
madmaxoft 31415aec63 Fixed MSVC warnings in SoundEffect functions. 2014-07-13 13:31:09 +02:00
Howaner d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang 5f72cdac38 Merge pull request #1154 from mc-server/trappedchests 
Implemented trapped chests & others
 2014-07-12 23:24:32 +01:00
Tiger Wang 372dbbb994 Merge pull request #1135 from mc-server/fixes 
Fixes to projectiles and the undead
 2014-07-09 09:50:38 +01:00
Tiger Wang 9e44b0aae1 Implemented trapped chests & others 
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
 2014-07-06 23:50:22 +01:00
Tiger Wang f4e11d194e Crash and compile fix 2014-07-04 22:07:26 +01:00
Tiger Wang b9d4431f6f Fixed respawning 
* Fixes #1103
 2014-06-29 22:44:16 +01:00
Howaner 50e112788b Send statistics to the player, when he logged in. 2014-06-29 01:40:15 +02: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 7615ed90c0 Merge branch 'master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Entity.h
	src/Entities/Player.h
 2014-06-21 22:14:23 +01:00
archshift e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
Tiger Wang 29567c5610 Portals animate and delay correctly 2014-06-12 15:21:07 +01:00
Tiger Wang bfa8aaf41b Merge branch 'master' into portals 
Conflicts:
	src/ClientHandle.cpp
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol17x.cpp
 2014-06-10 20:51:22 +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
Tiger Wang 86e5273cd1 Merge remote-tracking branch 'origin/master' into portals 2014-06-04 13:14:38 +01:00
Tiger Wang 8bff3e5af2 Implemented end and nether portals 2014-05-31 22:28:51 +01:00
madmaxoft 10273f64a2 Fixed a crash in message formatter. 
The code would fail if a message is sent to a player not yet added to a world.
 2014-05-28 22:41:23 +02:00
Tiger Wang 3a9543178a cCompositeChat message type is now formatted 2014-05-19 21:16:29 +01:00
Tiger Wang 42c36429d7 Added client translation to achievements 2014-05-19 20:40:56 +01:00
andrew b3d2b5b2c9 cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() 2014-05-12 17:05:09 +03:00
andrew c7c3724a3e Statistic Manager 2014-05-11 14:57:06 +03:00
Mattes D fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
Howaner fbb6404cc8 Change m_RepairCost to int. 2014-05-07 20:43:37 +02:00
Howaner d6cb6e0423 Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. 2014-05-07 12:30:30 +02:00
madmaxoft 383fe0cc1e Hotfixed Chunked transfer encoding in Yggdrasil. 
By using HTTP/1.0, we're disabling the support for the Chunked encoding on the server. This is a hotfix for #979, a proper parser implementation is still needed.
 2014-05-03 23:59:45 +02: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 58929a9948 Removed the unused cBlockingTCPLink class. 2014-04-30 17:06:46 +02:00
madmaxoft c045bb3f4c Removed unneeded #includes. 2014-04-29 17:45:20 +02:00
madmaxoft 6cb2d2461f Moved the rest of the Crypto objects into their own respective files. 2014-04-29 17:37:15 +02:00
madmaxoft ec33bbe294 Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects. 2014-04-29 11:04:54 +02:00
madmaxoft 0b16e6821f Merged branch 'master' into SslWrappers. 2014-04-28 22:05:02 +02:00
madmaxoft bab3a3cd31 Added the G1 root cert. 
Now the authenticator finally works.
 2014-04-28 21:16:52 +02:00
Mattes D 709015369d Merge pull request #940 from Howaner/GlobalFixes 
Add entity invulnerable
 2014-04-28 20:58:15 +02:00
Howaner 26e935cb20 Revert "Changed the old invulnerable methods from the wither to the new." 
This reverts commit d50f8f6f11.
 2014-04-28 13:51:22 +02:00
Mattes D c063051645 Merge pull request #954 from mc-server/projectiles-split 
Totally refactored ProjectileEntity.h, splitting up into several files.
 2014-04-28 12:32:02 +02:00
archshift 9b0cb3fd97 Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
madmaxoft dd52719c2d Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes. 2014-04-27 22:28:14 +02:00
madmaxoft fdac27c63d Another attempt at #889. 
The packet was being sent after the state was adjusted, so another thread *may* have sent another packet in the meantime.
 2014-04-27 17:31:58 +02:00
Mattes D a0f6149d05 Merge pull request #948 from jfhumann/staticFixes 
Fixes motivated by Coverity #1
 2014-04-27 17:00:37 +02:00
archshift e3c3795aa4 Moved cFireworkEntity out of ProjectileEntity.h 2014-04-26 17:50:05 -07:00
archshift 477b3e7861 Moved cArrowEntity out of ProjectileEntity.h 2014-04-26 16:45:39 -07:00
Howaner d50f8f6f11 Changed the old invulnerable methods from the wither to the new. 2014-04-26 17:47:25 +02:00