flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
4,250 Commits 1 Branch 0 Tags
0f7d90b7d18a1ccc59b2e47184bf8de1a21ec5a6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Harkness 584f7bd806 Merge pull request #679 from mc-server/NotchDeath 
NotchApple
 2014-02-15 19:04:13 +00:00
Alexander Harkness a57c8bd7da Merge pull request #677 from mc-server/BroadcastParticleEffect 
Broadcast particle effect
 2014-02-15 10:52:31 +00:00
Alexander Harkness 2152b8ca19 Merge pull request #659 from tonibm19/master 
Maybe fixed boat placing
 2014-02-10 17:27:46 +00:00
Alexander Harkness b9aa0420a3 Merge pull request #646 from worktycho/warningfixes 
Fixed most of the reordering warnings
 2014-02-05 18:24:08 +00:00
Alexander Harkness f9a4c49fd4 Contributors now match real life, and are alpha-sorted. 2014-01-31 17:16:08 +00:00
Alexander Harkness 79ef653cb7 Fixed some more. 2014-01-31 07:41:21 +00:00
Alexander Harkness d3b8796c48 Fixed at least a little of the plugin guide. 2014-01-30 21:19:45 +00:00
Alexander Harkness e0cb06dfae Update Core 2014-01-30 17:54:10 +00:00
Alexander Harkness 6b51c62d78 Merge pull request #586 from worktycho/BindingsMove 
Implented xofts suggestions in #577
 2014-01-25 05:53:01 -08:00
Alexander Harkness e21dcb3809 Merge pull request #582 from worktycho/BindingsMove 
added dependecies for bindings regen
 2014-01-23 11:56:12 -08:00
Alexander Harkness 9c93ab15ab Fix a crash but somewhere... 2014-01-20 19:02:37 +00:00
Alexander Harkness b3ac2d9e23 Fix bad nested headings. 2014-01-18 15:17:19 +00:00
Alexander Harkness 935600bf0a Merge pull request #554 from worktycho/compression 
Added user setting compression factor
 2014-01-17 11:11:37 -08:00
Alexander Harkness 714c8ed1a9 Updated core to the latest version and edited the submodules file to allow greater compatibility on restricted networks. 2014-01-17 10:38:36 +00:00
Alexander Harkness bf0d58428d Merge pull request #548 from worktycho/documention 
Added Documention for a few features I've added
 2014-01-16 09:55:37 -08:00
Alexander Harkness 273db55bdf Merge pull request #529 from mc-server/derpstonerefactor 
Major refactoring of redstone
 2014-01-12 04:38:41 -08:00
Alexander Harkness 6c469ec1f5 Removed bitdeli badge - we have GitHub analytics now. 2014-01-07 18:51:16 +00:00
Alexander Harkness 01fcf2fecb Merge pull request #516 from mc-server/favicon 
Fixed favicons
 2014-01-07 09:09:57 -08:00
Alexander Harkness f576b71809 Fix #506 2014-01-05 08:27:59 +00:00
Alexander Harkness 714cdc1e4a added supported protocol 2014-01-04 17:34:45 +00:00
Alexander Harkness a0932f2b1f Merge pull request #502 from bitdeli-chef/master 
Add a Bitdeli Badge to README
 2014-01-04 03:25:03 -08:00
Alexander Harkness bb0d43f70e Merge pull request #484 from worktycho/cmake-fixes 
fixes for mac os x
 2014-01-01 10:15:21 -08:00
Alexander Harkness eeeb2a6d22 Merge pull request #497 from xdot/master 
Fixed GetPhysicalRAMUsage on Linux
 2014-01-01 01:22:24 -08:00
Alexander Harkness e3726a8bb3 Merge pull request #476 from mc-server/apidump-writingplugin 
Writing a plugin APIDump article (#382)
 2013-12-26 07:16:23 -08:00
Alexander Harkness e42008aa84 Merge pull request #470 from mc-server/mobileentitysaving 
Preliminary mobile entity saving
 2013-12-25 08:21:36 -08:00
Alexander Harkness f2d2b4fecb Merge pull request #468 from mc-server/colourchange 
Update chat colours
 2013-12-24 07:55:15 -08:00
Alexander Harkness 200f37c41f removed the function def also 2013-12-24 13:26:54 +00:00
Alexander Harkness e1d3b201bd Finally removed the function. 2013-12-24 13:25:58 +00:00
Alexander Harkness 8c6337ff20 Removed documentation for cChatColour:MakeColor() 2013-12-24 13:25:03 +00:00
Alexander Harkness 8c91f7062a fixed compile? 2013-12-24 10:36:06 +00:00
Alexander Harkness af6389ea7a finally removed them all? 2013-12-24 10:30:36 +00:00
Alexander Harkness 8674c6800f updated another file... 2013-12-24 10:29:18 +00:00
Alexander Harkness b397dc438b Updated MakeColour's defenition in the header. 2013-12-24 10:24:08 +00:00
Alexander Harkness 085008ff8c Update as per xoft's instructions. 2013-12-24 10:17:44 +00:00
Alexander Harkness be79d12966 Update chat colours 
@madmaxoft, is this right? fixes #467
 2013-12-24 10:14:33 +00:00
Alexander Harkness dec59e783f Merge pull request #466 from Sxw1212/master 
Fix error on MagicCarpet Disable
 2013-12-24 00:03:52 -08:00
Alexander Harkness 17b56579eb Update GETTING-STARTED.md 2013-12-30 11:41:37 +00:00
Alexander Harkness e5f9c97e3d Create GETTING-STARTED.md 2013-12-30 11:22:52 +00:00
Alexander Harkness f4e68730d2 Merge pull request #460 from mc-server/Fishing_Items 
You are now able to get different items from fishing.
 2013-12-21 11:09:59 -08:00
Alexander Harkness 0d14229ffd Fixed a file name. 2013-12-21 16:23:15 +00:00
Alexander Harkness 553633dc72 Added info about 32 bit mode. 2013-12-21 14:38:37 +00:00
Alexander Harkness 93718f341c Merge pull request #457 from worktycho/master 
Added an option to force 32 bit compiliton
 2013-12-21 06:21:18 -08:00
Alexander Harkness b89720f4e1 Update README.md 2013-12-21 14:16:33 +00:00
Alexander Harkness 5c5b516eb0 Merge pull request #456 from mc-server/uselessfiles 
Uselessfiles
 2013-12-21 06:14:41 -08:00
Alexander Harkness 294e629600 Update COMPILING 2013-12-21 14:14:30 +00:00
Alexander Harkness 3dbc1a7e8a Merge pull request #446 from worktycho/cmake 
Rebuild build system with cmake
 2013-12-21 06:08:54 -08:00
Alexander Harkness d777c7efd9 Moved some files. 2013-12-21 12:59:41 +00:00
Alexander Harkness 809b4d7aad Marked stats.cmd as executable so it can be run on linux 2013-12-21 11:04:21 +00:00
Alexander Harkness 547c269b75 Update cloc-exclude.txt 2013-12-21 10:01:05 +00:00
Alexander Harkness 7f5d5a861b Updated the stats.cmd file. 2013-12-21 09:58:04 +00:00
Alexander Harkness 9206d05ecd Delete clean.bat 2013-12-21 09:56:55 +00:00
Alexander Harkness 1f03fc4bf9 Or not. Fixes #384 2013-12-20 17:35:59 +00:00
Alexander Harkness 7edad97205 Merge pull request #452 from mc-server/apidumpe 
Fix issue #384
 2013-12-20 09:12:49 -08:00
Alexander Harkness ba5e42de40 done... finally 2013-12-20 17:12:39 +00:00
Alexander Harkness d31fd1528b fix the issues xoft pointed out 2013-12-20 16:38:10 +00:00
Alexander Harkness 837bbf0de3 @madmaxoft now? 2013-12-20 16:31:30 +00:00
Alexander Harkness 675c35708b Possibly fixes #384 
@madmaxoft, is this the right syntax for lua for loops?
 2013-12-20 16:14:49 +00:00
Alexander Harkness 71006f5df5 Create a static folder for adding static files. 
.gitignore is basically just an empty file that might serve a purpose someday.
 2013-12-20 16:03:26 +00:00
Alexander Harkness bf31e80280 Merge pull request #451 from mc-server/dirtupdatefix 
Fixed assertion during dirt block OnUpdate()
 2013-12-19 23:05:27 -08:00
Alexander Harkness e37e8d2707 Merge pull request #448 from mc-server/testbranch 
travis ci pr test
 2013-12-19 13:10:02 -08:00
Alexander Harkness 5a97d831de take advantage of 1.5 cores given by travis with parallelization! 2013-12-19 20:56:07 +00:00
Alexander Harkness 296a421e8a just a little change for travis ci test 2013-12-19 20:49:35 +00:00
Alexander Harkness 3f496db5a9 explicitly defined email notifications 2013-12-19 20:42:40 +00:00
Alexander Harkness 4df5bbb3f3 update readme with travis info 2013-12-19 20:35:45 +00:00
Alexander Harkness 9f986a808c Update submodule URLs so people without SSH can get them. 2013-12-19 20:15:59 +00:00
Alexander Harkness 11e50df209 Create .travis.yml 2013-12-19 20:07:58 +00:00
Alexander Harkness 78c5908237 Test commit. 2013-12-19 20:04:40 +00:00
Alexander Harkness 56076c3baa Update Contributing.md 
Fixes #351
 2013-12-19 11:30:24 +00:00
Alexander Harkness 9a29af7151 Merge pull request #443 from mc-server/messages 
In-game message revision and fixes
 2013-12-19 00:02:49 -08:00
Alexander Harkness c1bc26f1ed Merge pull request #429 from worktycho/quickfixs 
a couple of fixes for warnings
 2013-12-14 07:49:00 -08:00
Alexander Harkness 4fcc806fb9 update d the contrib file. 2013-12-10 14:17:24 +00:00
Alexander Harkness 87680186ef Updated core. 2013-12-07 16:34:38 +00:00
Alexander Harkness 38563db3ce Updated TRANSAPI 2013-12-07 07:22:48 +00:00
Alexander Harkness 9f1efbdf21 Hopefully fixed the sparc not being detected 2013-12-04 18:57:23 +00:00
Alexander Harkness 5832781727 Updated TransAPI, fixes #389 
@madmaxoft is this the right API usage?
 2013-12-03 21:17:36 +00:00
Alexander Harkness 427b408fb0 Merge pull request #374 from mc-server/VS2013compilefix 
Fixed VS2013 compiling
 2013-11-28 10:36:00 -08:00
Alexander Harkness 187a0dbaa2 Removed some useless options. 2013-11-27 17:54:23 +00:00
Alexander Harkness 596963743e Fixed a load of issues, clang autodetection works now. 
This fixes issue #210.
This also removes the disableasm option, so it would be wise to remove
it from any scripts that use it.
I also removed a random line in the middle of globals.h, why was it
there?
 2013-11-27 17:18:40 +00:00
Alexander Harkness 3568adafc2 Removed the -g option for release builds, as binaries were getting huge. 2013-11-27 16:59:58 +00:00
Alexander Harkness a5425e0557 Removed the -Og option, which is rather new. 2013-11-27 16:57:28 +00:00
Alexander Harkness d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Alexander Harkness 3b790bbf67 Fixed some of tiger's derpyness. 2013-11-27 07:27:19 +00:00
Alexander Harkness 83d582d083 Removed a -Ofast bit. 2013-11-27 07:19:12 +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
Alexander Harkness 139bd34690 Merge branch 'master' into foldermove2 2013-11-26 17:15:39 +00:00
Alexander Harkness 770ef8c60b Fixed loads more of them. 2013-11-26 17:14:46 +00:00
Alexander Harkness 0b153f62f0 Another 2013-11-26 17:09:04 +00:00
Alexander Harkness a6b67e9cc1 And another. 2013-11-26 17:06:58 +00:00
Alexander Harkness c775011c98 Fixed another. 2013-11-26 17:06:26 +00:00
Alexander Harkness 66482c9db7 Fixed another one. 2013-11-26 17:06:00 +00:00
Alexander Harkness f792117ce5 Fixed a mis-include 2013-11-26 17:04:07 +00:00
Alexander Harkness a01d4a7b4a Removed excess includes. 2013-11-24 14:57:44 +00:00
Alexander Harkness ac99f3df9d Removed extra endif. 2013-11-24 14:38:41 +00:00
Alexander Harkness c3cd436ec3 Merge remote-tracking branch 'origin/master' into foldermove2 
Conflicts:
	GNUmakefile
 2013-11-24 14:37:03 +00:00
Alexander Harkness 4e463d591d Removed pedantic build and added optimisation to debug builds. 2013-11-24 14:31:36 +00:00
Alexander Harkness 998fb17fdc Moved tolua++ 2013-11-24 14:29:35 +00:00
Alexander Harkness 1de69f5b54 Moved zlib 2013-11-24 14:28:29 +00:00
Alexander Harkness d7ca8ea57b Moved Lua 2013-11-24 14:27:32 +00:00
Alexander Harkness 4c67f49c87 Moved JSONCPP 2013-11-24 14:24:26 +00:00
Alexander Harkness 9c10729f00 Moved iniFile 2013-11-24 14:22:15 +00:00