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

9409 Commits

Author SHA1 Message Date
bibo38 19b65ce357 Fixed failed assertation 
This was caused by a monster with a negative Y-axis.
Fixes #2336
 2015-11-03 08:39:18 +01:00
worktycho 47604cd914 Merge pull request #2591 from cuberite/chunkprepare-deadlock 
Fix deadlock, resolves #2521
 2015-11-03 00:23:45 +00:00
Tiger Wang 9de3a3f938 Examined a fix for #2588 2015-11-02 22:07:48 +00:00
Alexander Harkness 8eba35e283 Merge branch 'master' into chunkprepare-deadlock 2015-11-02 20:18:49 +00:00
Alexander Harkness 51948058ad Merge pull request #2594 from cuberite/bearbin-patch-1 
Fix shell location.
 2015-11-02 20:18:17 +00:00
Alexander Harkness 231fa29174 Fix shell location. 2015-11-02 19:14:49 +00:00
Alexander Harkness 7e4c56ce0d Fix deadlock, resolves #2521 2015-11-02 18:21:35 +00:00
Alexander Harkness ad8b711b4d Merge pull request #2587 from cuberite/bountysource-not-gratipay 
Removed mentions of Gratipay, replaced with Bountysource.
 2015-11-01 16:28:15 +00:00
Alexander Harkness fce6daef2c Removed mentions of Gratipay, replaced with Bountysource. 2015-11-01 15:50:47 +00:00
worktycho 2c5c4fa03d Merge pull request #2586 from bibo38/drownpotion 
Implemented the Water Breathing Potion functionality.
 2015-11-01 14:20:13 +00:00
bibo38 435bae104d Implemented the Water Breathing Potion functionality. 
Fixes #2556
 2015-11-01 11:50:03 +01:00
Alexander Harkness cb551e9512 Fixed typo that slipped through #2584 2015-10-31 22:32:50 +00:00
Alexander Harkness b4f464976a Fixed help text again, another part had changed. 2015-10-31 22:25:21 +00:00
Alexander Harkness 837b5e0d14 Fixed outdated help text in easyinstall. 2015-10-31 22:22:59 +00:00
Alexander Harkness 2e836ed4e9 Fixed typo in description. 2015-10-31 22:19:31 +00:00
Alexander Harkness b13fd00ec4 Merge pull request #2584 from bibo38/firepotion 
Implemented the FireResistence potion effects.
 2015-10-31 22:18:27 +00:00
bibo38 73b8be0fef Implemented the FireResistence potion effects. 
This not only provides fire resistence, but also prevents blaze fireballs.
See #2556
 2015-10-31 23:06:10 +01:00
Alexander Harkness 9c270d522c Merge pull request #2549 from cuberite/TouchGround 
Debug mode: Fixed assertion, if player below y < 0
 2015-10-31 15:12:49 +00:00
Lukas Pioch 5ae19fb332 Debug mode: Fixed assertion, if player below y < 0 2015-10-31 14:26:24 +01:00
Lukas Pioch 5d2b70ed80 Merge pull request #2581 from bibo38/clangfix 
Changed for-loop iterator in File.cpp
 2015-10-30 20:27:20 +01:00
bibo38 ec5c38761f Changed for-loop iterator in File.cpp to a reference type to reduce object copying and fix the clang build. 
Fixes #2580
 2015-10-30 20:16:45 +01:00
Lukas Pioch 0ab0a2f146 Merge pull request #2567 from cuberite/cave_spider 
Added cave spider to MobSpawner
 2015-10-29 14:28:19 +01:00
Lukas Pioch 3e48b1f1eb Added cave spider to MobSpawner 2015-10-29 13:35:35 +01:00
Mattes D ca705c23e8 Merge pull request #2578 from cuberite/revert-2574-pressure-plate-fix 
Revert "Pressure plate fix"
 2015-10-29 11:57:38 +01:00
Mattes D a7c75d61ce Revert "Pressure plate fix" 2015-10-29 11:43:01 +01:00
Alexander Harkness d290b1e48a Merge pull request #2574 from Schwertspize/pressure-plate-fix 
Pressure plate fix
 2015-10-28 21:29:10 +00:00
Schwertspize 525b967c93 fixed pressure plate bugs 2015-10-28 22:21:46 +01:00
Alexander Harkness 54583d74b4 Merge pull request #2576 from Schwertspize/patch-1 
Added myself to list, ran it through `sort -f`
 2015-10-28 19:17:09 +00:00
Schwertspize e02313c7ea Added myself to list, ran it through `sort -f` 2015-10-28 20:13:21 +01:00
Alexander Harkness 745e6bd0b8 Merge pull request #2575 from Schwertspize/patch-1 
remove contentless bullet point
 2015-10-28 18:51:41 +00:00
Schwertspize 2f269342c7 remove contentless bullet point 
white space is for free, but thats not neccesairy
 2015-10-28 19:37:32 +01:00
Alexander Harkness d14c8fa446 Fix wrong teleport permission. (solves #2369) 2015-10-28 08:24:48 +00:00
Mattes D d7d2bc0bec Merge pull request #2566 from cuberite/update_submodules 
Updated Core and ProtectionAreas
 2015-10-27 11:29:55 +01:00
Lukas Pioch 009a05e4f0 Updated Core and ProtectionAreas 2015-10-27 10:19:30 +01:00
Mattes D 1a2cc9e497 Merge pull request #2564 from cuberite/update_jsoncpp_no_jsoncpp 
Update Loops required for JsonCPP
 2015-10-26 07:41:07 +01:00
Lukas Pioch 079bb7c016 Update Loops required for JsonCPP 2015-10-26 00:16:35 +00:00
Mattes D 7761f7e5b8 Debuggers: Added a plugin channel test with funny chars in data. 2015-10-21 20:59:54 +02:00
Mattes D da92286da9 Fixed a crash when sending messages too early after connection. 2015-10-21 20:59:48 +02:00
Mattes D 140d31343f Merge pull request #2517 from cuberite/ReTypingOfBlocks 
ReTyped block ids
 2015-10-15 12:14:27 +02:00
Julian Laubstein 979ab11044 ReTyped block ids 2015-10-15 10:53:32 +02:00
NiLSPACE cf8d508939 Merge pull request #2544 from cuberite/worktycho-patch-1 
Removed unused typedef
 2015-10-12 16:17:34 +02:00
worktycho 183284a2a4 Removed unused typedef 2015-10-12 15:02:25 +01:00
NiLSPACE 24ebae8c4f Merge pull request #2543 from Seadragon91/pluginmanager_hooks 
Added missing hooks to cPluginManager
 2015-10-12 11:17:56 +02:00
Lukas Pioch ff08d3de19 Added missing hooks to cPluginManager 2015-10-12 11:03:49 +02:00
Mattes D f6cd03db53 APIDump: Added a missing endline to the NewlyUndocumented output file. 2015-10-11 21:25:40 +02:00
Mattes D 4a1cec01e8 Merge pull request #2537 from cuberite/NetworkSslClientTest 
Added 'net sclient' command to NetworkTest plugin.
 2015-10-11 21:23:06 +02:00
Mattes D b95d6a5b8a Added 'net sclient' command to NetworkTest plugin. 2015-10-09 18:34:32 +02:00
worktycho 1a572e6611 Merge pull request #2535 from cuberite/FixGitQueries 
Added WORKING_DIRECTORY specification to git queries used in CMake.
 2015-10-09 10:38:23 +01:00
Mattes D afda3b0019 Added WORKING_DIRECTORY specification to git queries used in CMake. 
Fixes #2493.
 2015-10-09 11:15:40 +02:00
Mattes D c2b06b59d0 Merge pull request #2534 from cuberite/FixHTTPSServer 
Fixed a possible crash in HTTPS server.
 2015-10-08 22:03:24 +02:00