flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
3,268 Commits 1 Branch 0 Tags
aa53fe6761a87398bc8aa626a52bd3ade2d8114b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexander Harkness 28b56cf474 Moved expat 2013-11-24 14:21:35 +00:00
Alexander Harkness 3438e5d3dd move cryptopp into lib 2013-11-24 14:21:13 +00:00
Alexander Harkness 675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00
Alexander Harkness dbf2982e52 And another... 2013-11-16 18:58:38 +00:00
Alexander Harkness f4f906563f another 2013-11-16 18:58:17 +00:00
Alexander Harkness ef8ac545d8 Fixed another one. 2013-11-16 18:57:03 +00:00
Alexander Harkness 0150de3688 Fixed some unsigned int comparison warnings. 2013-11-16 18:55:49 +00:00
Alexander Harkness 755fe9cb21 WaveNoise not used, removing. 2013-11-16 18:54:01 +00:00
Alexander Harkness 45aebbd5ab This is a copy-paste fail, right? 2013-11-16 18:52:48 +00:00
Alexander Harkness 9ac95fc24a Got rid of yet another unused variable. 2013-11-16 18:50:33 +00:00
Alexander Harkness c1880e1162 Got rid of another unused variable. 2013-11-16 18:47:25 +00:00
Alexander Harkness eb77bfc1b3 Those variables weren't used. 
It seems strange for them to be there, is the code written wrong?
 2013-11-16 18:46:06 +00:00
Alexander Harkness 5687ca7bad Fixed another one... 2013-11-16 18:44:19 +00:00
Alexander Harkness a319973e50 Fixed yet another unsigned integer comparison. 2013-11-16 18:43:40 +00:00
Alexander Harkness d3360051b1 Fixed typo causing buggy code. 2013-11-16 18:37:43 +00:00
Alexander Harkness f217981de9 Fixed another unsigned integer comparison. 2013-11-16 18:34:54 +00:00
Alexander Harkness 574e8f1419 Fixed unsigned integer comparison. 2013-11-16 18:27:30 +00:00
Alexander Harkness 5337fee8e0 Fixed a warning about brackets. 
Is this the right way round? This is how C++ interprets it, so it should be changed if this is the wrong way round.
 2013-11-16 18:26:46 +00:00
Alexander Harkness 9060fbf4b5 Fixed a warning about unsigned int comparison - probably was a real issue. 2013-11-16 18:15:12 +00:00
Alexander Harkness ab676060fa Revert "Silenced another warning." 
This reverts commit dc94b92753.
 2013-11-16 17:54:18 +00:00
Alexander Harkness 33e1439c80 Revert "Silenced yet another not completed enum warning." 
This reverts commit 444e6e4fa7.
 2013-11-16 17:53:55 +00:00
Alexander Harkness 2f2fe8ab0c Revert "Fixed another one." 
This reverts commit 3328c80aec.
 2013-11-16 17:53:27 +00:00
Alexander Harkness eca23ed0b3 Always warn about everything! 
This should help me in my efforts.
 2013-11-16 17:49:14 +00:00
Alexander Harkness d665bc8806 Merge pull request #349 from SamJBarney/master 
Fixed growing issue with crops.
 2013-11-14 10:17:11 -08:00
Alexander Harkness 3328c80aec Fixed another one. 2013-11-14 07:42:54 +00:00
Alexander Harkness 444e6e4fa7 Silenced yet another not completed enum warning. 2013-11-14 07:42:03 +00:00
Alexander Harkness dc94b92753 Silenced another warning. 2013-11-14 07:38:59 +00:00
Alexander Harkness 56c23305d5 Added the last bit of the enum, and alpha-sorted the switch. 2013-11-13 20:13:35 +00:00
Alexander Harkness 3ea3da8b3f Removed unnecessary format data. 2013-11-13 20:09:24 +00:00
Alexander Harkness cd8894fca6 Got rid of warnings caused by the -s option on Clang, and it doesn't seem to do anything anyway. 2013-11-13 19:53:39 +00:00
Alexander Harkness 26ac6881cd Fixed some of the comments in the makefile. 2013-11-13 19:41:05 +00:00
Alexander Harkness 9692f20a99 Fixed link error with clang on x86_64. 2013-11-13 19:36:04 +00:00
Alexander Harkness ac5a65915f Update READme a bit more 2013-11-02 21:10:54 +00:00
Alexander Harkness 7ec5a5a96c Updated some stuff about submodule init. 2013-11-02 21:09:02 +00:00
Alexander Harkness 54f5f71c9a Merge pull request #286 from tigerw/pickupdelay 
Pickups now have collection delay when vomited
 2013-10-23 23:36:25 -07:00
Alexander Harkness 3272b45bc5 Added a string reserve. 2013-10-19 21:30:54 +01:00
Alexander Harkness 5ba998174a Fixed compile error. silly parentheses creeping in. 2013-10-19 21:21:44 +01:00
Alexander Harkness d1ddd2492b Added a APIDump description for GetHTMLEscapedString. 2013-10-19 21:18:27 +01:00
Alexander Harkness 0677872d88 Changed the code according to xoft's suggestions. 2013-10-19 21:13:47 +01:00
Alexander Harkness f7c9230106 Fixed general failings with everything. Fixes #211. 
My editor fixed some extra tabs in globals.
 2013-10-19 17:37:47 +01:00
Alexander Harkness 9701a7fb84 Added a HTML escaping function to cWebAdmin. 
Apparently my editor fixed some failed tabs too.
 2013-10-19 17:17:33 +01:00
Alexander Harkness 17aff20666 Added HOOK_PLAYER_RIGHT_CLICK 2013-10-15 19:57:00 +01:00
Alexander Harkness 9376005778 Merge pull request #258 from tonibm19/patch-2 
Added horse saddling and basic milk code.
 2013-10-15 09:39:16 -07:00
Alexander Harkness 84b08951cd Merge pull request #257 from Sofapriester/patch-1 
Update BlockID.cpp -> fix Issue #254
 2013-10-14 23:30:19 -07:00
Alexander Harkness bf5f4603d9 Add the first line back. 2013-10-14 16:57:57 +01:00
Alexander Harkness 71f53cbaef Merge pull request #251 from tonibm19/patch-1 
Stairs crafting fixes
 2013-10-14 08:57:30 -07:00
Alexander Harkness c34a9422f7 Updated plugins. 2013-10-07 07:38:20 +01:00
Alexander Harkness 59cf62f268 Merge pull request #172 from tigerw/bugfixes 
Fixes to torches and entities - because they were derpy zubzubs.
 2013-09-17 02:28:09 -07:00
Alexander Harkness e875bbe2e6 Fixed missing newline. 2013-09-16 19:16:05 +01:00
Alexander Harkness 059648fcb1 Merge pull request #171 from tonibm19/patch-5 
Vanilla like maximum and default view distance
 2013-09-16 11:09:03 -07:00
Alexander Harkness 3abfd46f55 Merge pull request #161 from worktycho/master 
Autodetect clang and disable tautological compare warning and inline assembly in cryptopp
 2013-09-11 10:55:06 -07:00
Alexander Harkness f8f0a4c4b7 Merge pull request #158 from worktycho/master 
Allow the user to override the compiler using env variables.
 2013-09-10 12:58:44 -07:00
Alexander Harkness 2ca68738b8 Blank linez 2013-09-10 14:14:51 +01:00
Alexander Harkness 728eb9b6a7 Change the gitignore, fix #122 2013-08-24 11:09:11 +01:00
Alexander Harkness b82dd8868c Merge pull request #100 from mc-server/pluginsubmodules 
Make the plugins into submodules.
 2013-08-16 13:05:38 -07:00
Alexander Harkness 7e9957919e Removed an old cloneplugins file. 2013-08-16 12:44:38 +01:00
Alexander Harkness c3c3068fab Changed README so it knows about submodules 2013-08-16 12:43:56 +01:00
Alexander Harkness 1af758569d Added transapi as a submodule - so it more accurately reflects the source origin. 2013-08-16 12:17:31 +01:00
Alexander Harkness 024fe5e6c5 Added the removed plugins as submodules. 2013-08-16 12:14:05 +01:00
Alexander Harkness 69fcf3188a Changed a line, new PR system test. 2013-08-15 18:11:35 +01:00
Alexander Harkness 54c8bf2e97 Merge pull request #95 from mc-server/CryptoUpdate 
CryptoPP update
 2013-08-15 09:53:45 -07:00
Alexander Harkness d211cc91c4 Removed 's' at the end of CONTRIBUTING.md 2013-08-14 10:30:54 +01:00
Alexander Harkness 959f875bba Moved the file as it was markdown. 2013-08-14 10:29:43 +01:00
Alexander Harkness a25fe9d3b2 Merge pull request #90 from mc-server/contributing 
Added basic contributing file, fixes #86.
 2013-08-14 02:27:00 -07:00
Alexander Harkness ade261255c Added tabs/spaces stuff. 2013-08-14 10:26:30 +01:00
Alexander Harkness 386d8190e9 Added basic contributing file, fixes #86. 2013-08-14 09:54:32 +01:00
Alexander Harkness 765bbe739e Added the transapi permission because yay! 2013-08-13 20:02:38 +01:00