1
0
Commit Graph

3477 Commits

Author SHA1 Message Date
tycho
f739246e52 added precompiled headers 2013-12-20 16:05:12 +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
madmaxoft
fc97cb8c58 Fixed a typo in cBlockArea merging code. 2013-12-20 16:48:45 +01:00
madmaxoft
d6de11da07 Sorted a few constructors to remove warnings. 2013-12-20 16:39:20 +01:00
tycho
f6d5a788aa fixed include of math on windows 2013-12-20 15:37:35 +00:00
Tycho Bickerstaff
32e6be002d Merge branch 'master' into cmake 2013-12-20 15:33:04 +00:00
Tycho Bickerstaff
18b99c7eff made LUA shared unless STATIC_LUA is set 2013-12-20 15:29:34 +00:00
Tycho Bickerstaff
be77ecf19d fixed lua dependency on libm 2013-12-20 15:24:55 +00:00
madmaxoft
eabb88eb74 Fixed minor warnings. 2013-12-20 16:22:16 +01:00
madmaxoft
b66722f735 Fixed warnings in HTTP parser. 2013-12-20 16:20:54 +01:00
madmaxoft
812375fab1 Attempt at fixing cChunkDef::Height signedness. 2013-12-20 16:15:39 +01:00
madmaxoft
b6e4d2c263 Properly fixed warnings in cFastRandom. 2013-12-20 16:11:25 +01:00
madmaxoft
8610d45ef1 Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
madmaxoft
b19d765666 Fixed melon and pumpkin growing. 2013-12-20 15:50:46 +01:00
madmaxoft
00911c5f94 Fixed missing parenthesis. 2013-12-20 15:44:56 +01:00
Tycho Bickerstaff
826e280db9 added profile builds as an option 2013-12-20 14:27:26 +00:00
Tycho Bickerstaff
fda983fcb4 possable fix of typo 2013-12-20 14:03:40 +00:00
Tycho Bickerstaff
bc2d23550c Revert "fixed bad reference to math library"
This reverts commit 0836e5e660.
2013-12-20 13:51:33 +00:00
Tycho Bickerstaff
efaabb16df Revert "fixed bad reference to math library"
This reverts commit c2167d7ed7.
2013-12-20 13:50:41 +00:00
Tycho Bickerstaff
c2167d7ed7 fixed bad reference to math library 2013-12-20 13:27:38 +00:00
Tycho Bickerstaff
0836e5e660 fixed bad reference to math library 2013-12-20 13:21:58 +00:00
madmaxoft
ea65243119 Fixed clang warnings in Noise.cpp.
Fix-a-random-warning-per-day :)
2013-12-20 10:11:33 +01: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
Tiger Wang
c08910d4af Fixed assertion during dirt block OnUpdate() 2013-12-19 23:06:26 +00:00
Mattes D
39251bccd3 Merge pull request #450 from mc-server/redstonefixes
Multiple fixes
2013-12-19 13:58:49 -08:00
Mattes D
03ec64aee1 Merge pull request #449 from mc-server/Fishing_Rod
Fishing rod
2013-12-19 13:51:21 -08:00
STRWarrior
a1ce0a6d73 Fixed #include in Floater.cpp. 2013-12-19 22:44:10 +01:00
STRWarrior
32d117a498 The floater now actualy dives under water. 2013-12-19 22:18:05 +01:00
STRWarrior
018c65b4e3 You can get fish from fishing :D. Only one type of fish though. 2013-12-19 22:16:15 +01: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
Tiger Wang
03a8dfc4a8 Fixed PlayerAbilities and creative 2013-12-19 20:53:47 +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
Tycho Bickerstaff
cb9f30d4ee Merge branch 'cmake' of github.com:worktycho/MCServer into cmake 2013-12-19 17:21:29 +00:00
tycho
162b085d80 fixed include paths on windows and added build dir to gitignore 2013-12-20 00:31:52 +00:00
tycho
c7d766bbcc fixed compile errors with headers and math library 2013-12-20 00:22:06 +00:00
tycho
095c335e82 Merge branch 'cmake' of github.com:worktycho/MCServer into cmake 2013-12-20 00:13:21 +00:00
tycho
7735a956f0 Merge branch 'master' into cmake 2013-12-20 00:13:04 +00:00
tycho
622777f545 fixed D9025 2013-12-19 23:42:47 +00:00
tycho
44638cd24a fixed multiprocessing on windows and removed redundend compile of headers 2013-12-19 23:37:24 +00:00
Tycho Bickerstaff
163fe32a6d modified travis CI file for cmake 2013-12-19 17:21:06 +00:00
Tycho Bickerstaff
fbb47cd2ae Merge branch 'master' into cmake 2013-12-19 17:14:52 +00:00
STRWarrior
4a02898683 Added the Floater files to MCServer.vcproj 2013-12-19 17:46:12 +01:00
STRWarrior
d9c8ae37cf Implented cItemFishingRodHandler. 2013-12-19 17:34:03 +01:00
STRWarrior
3d70d7198d Implented IsFishing, SetIsFishing and GetFloaterID(). 2013-12-19 17:33:21 +01:00