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

107 Commits

Author SHA1 Message Date
jfhumann 013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Tycho 23395a5ce1 Merge branch 'master' into override 
Conflicts:
	lib/tolua++/CMakeLists.txt
 2014-04-05 14:12:17 -07:00
madmaxoft a5c0600e6c Fixed a few clang warnings. 2014-03-30 20:02:30 +02:00
andrew 4f3377bbbf Minor fixes 2014-03-25 09:10:55 +02:00
andrew 6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
Tycho 5653997bcc Added override specifier to functions declared in cWorld 2014-03-22 08:43:54 -07:00
Tiger Wang 0524d70774 ENUMified shrapnel level 2014-03-19 23:06:39 +00:00
Tiger Wang b8fe024f9d Merge branch 'master' into awesometnt 
Conflicts:
	src/ChunkMap.cpp
 2014-03-18 20:49:08 +00:00
Tiger Wang 23ffaa19b7 Added levels of shrapnel 2014-03-18 20:45:10 +00:00
madmaxoft 260d13c7a4 Added override specifier where appropriate in cWorld. 2014-03-16 21:56:27 +01:00
Mattes D 4ec402e6f9 Merge pull request #782 from mc-server/beds 
Beds now work properly, fixes #707
 2014-03-16 21:47:34 +01:00
andrew b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
Tiger Wang e672988577 Merge remote-tracking branch 'origin/master' into awesometnt 
Conflicts:
	src/Items/ItemLighter.h
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-03-10 18:59:11 +00:00
Tiger Wang cc2d805238 Merge branch 'master' into awesometnt 2014-03-10 18:36:55 +00:00
Tiger Wang 462829e23d Shrapnel now configurable 2014-03-10 18:35:02 +00:00
Tiger Wang 09c5542123 Merge pull request #768 from Howaner/BlockEntitys 
Add TNT load/save
 2014-03-09 21:44:32 +00:00
Tiger Wang b64e9fb7f5 Beds now work properly fixes #707 
Also fixes FS392

Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
 2014-03-09 15:32:34 +00:00
Tiger Wang c2978a3457 Merge branch 'master' into ballisticmissiles 
Conflicts:
	src/ClientHandle.cpp
 2014-03-09 12:53:50 +00:00
Howaner 527f358510 Merge branch 'master' into BlockEntitys 2014-03-08 12:29:45 +01:00
Howaner b37966fd21 Change TNT Fuse to ticks 2014-03-08 12:24:33 +01:00
Mattes D f72c747b50 Merge pull request #763 from Howaner/BlockEntitys 
Add Flower Pots
 2014-03-07 17:54:10 +01:00
Howaner c2090c0d11 Add Lua Bindings for FlowerPotEntity.h and add documentation. 2014-03-07 11:44:16 +01:00
Howaner 787a71929c Add Flower Pots 2014-03-07 01:30:34 +01:00
Howaner 594ddd86a0 Add SendBlockTo to cWorldInterface 2014-03-05 19:33:43 +01:00
madmaxoft 442c1d96fc Fixed previous weather changes. 
cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather.
 2014-03-03 20:55:04 +01:00
Howaner 1d67345989 Add cancelling to WeatherChanging event. 2014-03-02 21:04:01 +01:00
Howaner 5e427ee825 More documentation (thanks to madmaxoft) and use GetBlockTypeMeta 2014-03-02 16:16:22 +01:00
Howaner e4b2502896 Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs 2014-03-02 16:01:37 +01:00
Tiger Wang baf2d88921 Implemented ballistic missiles (fireworks) 
+ Added fireworks
 2014-02-26 23:33:52 +00:00
andrew f471873945 Maps: Improvements 2014-02-23 15:05:03 +02:00
andrew f201f4f176 Thread safe cMap manager 2014-02-20 16:38:37 +02:00
andrew 83d3a2eedf Manual merge (Fixed conflicts) 2014-02-20 15:37:15 +02:00
Mattes D 87db4b6a90 Merge pull request #697 from Howaner/Skull 
Add Skulls/Heads to MCServer
 2014-02-19 22:12:38 +01:00
Howaner d63ce62f3b Rename SkullEntity to MobHeadEntity 2014-02-19 14:45:09 +01:00
Howaner 52c41f8869 Add Heads completely 2014-02-18 21:40:02 +01:00
madmaxoft b1c6b4f584 The cuboid for cWorld::SetAreaBiome() doesn't need sorting. 2014-02-18 13:49:24 +01:00
madmaxoft 803ea41236 Added cWorld:SetAreaBiome() API function. 
Fixes #675.
 2014-02-18 13:49:23 +01:00
madmaxoft fc8743df96 Added a bit more documentation to cForEachChunkProvider. 2014-02-18 13:49:23 +01:00
madmaxoft 52cd9dfe9f Removed the unnecessary LoopPlayersAndBroadcastChat() functions. 2014-02-15 23:26:19 +01: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
Alexander Harkness a57c8bd7da Merge pull request #677 from mc-server/BroadcastParticleEffect 
Broadcast particle effect
 2014-02-15 10:52:31 +00:00
STRWarrior ceb16ea2f7 Exported cWorld::BroadcastParticleEffect. 2014-02-15 11:38:20 +01:00
andrew 5b92b877bc Send map when selected 2014-02-14 16:21:16 +02:00
andrew 32b465b8e1 IDCount Serialization 2014-02-13 21:36:24 +02:00
madmaxoft 9bb48a8fa4 Merged branch 'narroo/master'. 
This merges pull request #661.
 2014-02-13 17:04:25 +01:00
narroo e53b331b4a Fixed formatting. Moved UnloadUnusedChunks from public to private. 2014-02-11 14:38:28 -05:00
narroo d7f32ed682 Fixed formatting of previous commit. 2014-02-11 08:01:25 -05:00
madmaxoft 892c7eb57f More gcc warnings fixed. 2014-02-11 11:56:29 +01:00
narroo e8e76a6058 Fixed bug #385. UnloadUnusedChunks now has the same interface as 
SaveAllChunks.  Meaning, QueueUnloadUnusedChunks and the supporting
cTaskUnloadUnusedChunks has been added.  Use QueueUnloadUnusedChunks from
now on to prevent deadlocking.
 2014-02-10 20:00:07 -05:00
madmaxoft a184d59209 Merge remote-tracking branch 'origin/master' into ChunkStay 2014-02-09 09:36:42 +01:00