1
0
Commit Graph

3677 Commits

Author SHA1 Message Date
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
STRWarrior
f244dbfb12 You are now able to get different items from fishing. 2013-12-21 19:58:52 +01:00
madmaxoft
7eaf7342d4 Fixed a typo in .gitignore.
The VC IntelliSense DB was getting through again.
2013-12-21 19:34:03 +01:00
madmaxoft
abd1ca4fef Bindings regen script updated.
The Bindings.cpp / .h files are no longer stored in the git repo.
2013-12-21 19:30:16 +01:00
madmaxoft
7565026659 Further updates for the win nightbuild script.
The FTP variables needed are checked at the beginning.
The tag file is stored in a per-month subfolder.
The bindings are correctly regenerated.
2013-12-21 19:28:00 +01:00
STRWarrior
bd6574230a Floater now dissapears when the player doesn't have an fishing rod equipped. 2013-12-21 17:31:05 +01:00
Alexander Harkness
0d14229ffd Fixed a file name. 2013-12-21 16:23:15 +00:00
worktycho
d8b4bf8a70 Update COMPILING
fixed acouple of issues
2013-12-21 16:00:47 +00:00
Tycho Bickerstaff
b3046a09e5 Chunk is now warnings clean 2013-12-21 15:58:21 +00:00
Tycho Bickerstaff
3289abde73 fixed hidden bug with furnaces ignoring time burnt
this patch fixes an issue with furnaces where they would ignore the time burnt in setBurnTimes
this did not cause a problem as this function was only called with the same value as the one
it was using for time burnt
2013-12-21 15:49:59 +00:00
Tycho Bickerstaff
9f41761e8e Root is now warnings clean 2013-12-21 15:38:37 +00:00
Tycho Bickerstaff
5034ae29b8 Piston is now warnings clean 2013-12-21 15:08:01 +00:00
Tycho Bickerstaff
38f808ac3d ChunkSender is now warnings clean 2013-12-21 15:00:31 +00:00
Tycho Bickerstaff
14d2085e35 basic threadsafe queue interface 2013-12-21 14:43:32 +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
Tycho Bickerstaff
c99e841e24 added FORCE_32 option 2013-12-21 14:18:22 +00: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
Tycho Bickerstaff
b9516c1208 hide lua shared library 2013-12-21 14:12:50 +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
Tycho Bickerstaff
650a1483b8 fixed lua dynamic library 2013-12-21 13:50:32 +00:00
Tycho Bickerstaff
869104de34 finished up final build flags for linux 2013-12-21 13:45:27 +00:00
Tycho Bickerstaff
b4fb8ace03 Merge branch 'cmake' of github.com:worktycho/MCServer into cmake 2013-12-21 13:33:09 +00:00
Tycho Bickerstaff
779aca6051 Merge branch 'master' into cmake 2013-12-21 13:32:40 +00:00
Tycho Bickerstaff
66d643f407 Merge branch 'master', remote-tracking branch 'upstream/master' 2013-12-21 13:32:27 +00:00
STRWarrior
128de10a2f You could now only get fish from non-source blocks. Fixed it. 2013-12-21 14:11:21 +01:00
STRWarrior
3c73076be4 Fixed bug where you could pickup the floater only to get one spawned instantly or the other way around. 2013-12-21 14:08:58 +01:00
STRWarrior
8efde94e4e Fixed bug where you could get fish from non-source blocks. 2013-12-21 14:07:32 +01:00
Alexander Harkness
d777c7efd9 Moved some files. 2013-12-21 12:59:41 +00:00
madmaxoft
78bd1a6165 Updated the win nightbuild script with recent information.
As requested in #455.
2013-12-21 12:12:39 +01:00
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