1
0
Commit Graph

3595 Commits

Author SHA1 Message Date
Alexander Harkness
809b4d7aad Marked stats.cmd as executable so it can be run on linux 2013-12-21 11:04:21 +00:00
Mattes D
8c02f2c8e1 Merge pull request #454 from mc-server/repeaters
Fixed repeaters delay, maybe
2013-12-21 02:57:29 -08: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
Tiger Wang
432a28d935 Fixed repeaters delay, maybe
Also added basic daylight sensors, though because GetBlockSkylight
always is 15, it doesn't work.
2013-12-20 21:19:13 +00:00
STRWarrior
9c575681f8 Merge branch 'master' of https://github.com/mc-server/MCServer 2013-12-20 19:50:47 +01:00
STRWarrior
6afe6b7928 Increased the range an Floater can shoot to. 2013-12-20 19:49:30 +01:00
madmaxoft
f5e6124ee0 Fixed the rest of constructor reorders. 2013-12-20 19:10:15 +01:00
Alexander Harkness
1f03fc4bf9 Or not. Fixes #384 2013-12-20 17:35:59 +00:00
STRWarrior
61120686c6 Fish now actualy jumps to the player instead of a few block bellow them. 2013-12-20 18:35:13 +01:00
STRWarrior
af98fc6170 Fixed bug where the floater could pop in the water while you could already get a fish. 2013-12-20 18:34:08 +01: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
madmaxoft
8570d08eb4 More reordering fixes. 2013-12-20 17:11:51 +01:00
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