Tycho Bickerstaff
1f938b721b
added mergetool files to gitignore
2013-12-22 16:27:20 +00:00
Tycho Bickerstaff
10e5540f98
merged in more warning fixes
2013-12-22 16:25:02 +00:00
Tycho Bickerstaff
a295e0c342
merged in changes
2013-12-22 16:22:25 +00:00
Tycho Bickerstaff
09b9661fff
Merge branch 'master' into threadsafequeue
2013-12-22 16:14:34 +00:00
Tycho Bickerstaff
15a980a616
merged in warnings changes
2013-12-22 16:11:34 +00:00
Tycho Bickerstaff
d2ed9d9fc4
removed lua makefile
2013-12-22 15:57:56 +00:00
Tycho Bickerstaff
a7a4b2886d
fixed accedental commit
2013-12-22 15:55:57 +00:00
Tycho Bickerstaff
a71299c46b
fixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker not
2013-12-22 15:41:01 +00:00
Tycho Bickerstaff
1a9d93665f
Merge remote-tracking branch 'upstream/master' into threadsafequeue
2013-12-22 15:21:34 +00: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
madmaxoft
61254d0356
APIDump: Fixed a factual error in OnPluginsLoaded description.
2013-12-29 14:48:58 +01:00
madmaxoft
61af77a5c5
APIDump: Static files overwrite their destination.
2013-12-29 13:24:38 +01:00
madmaxoft
8406a37ac2
APIDump: The PRE html tag has tab width set to 2 spaces.
2013-12-29 13:23:30 +01:00
madmaxoft
b84cd0b3c5
APIDump: Documented OnPluginsLoaded.
2013-12-29 13:15:46 +01:00
madmaxoft
248ba1ea9f
Added HOOK_PLUGINS_LOADED.
...
This fixes #482 .
2013-12-29 12:51:58 +01:00
Mattes D
d40ed86907
Merge pull request #481 from MikeHunsinger/master
...
Added function to create large birch tree images in birch forests
2013-12-29 00:04:08 -08:00
Mike Hunsinger
b93b4c4825
Added function to create Tall Birch tree in BirchTreeForest biomes
2013-12-28 23:49:51 -07:00
madmaxoft
725b997a28
Fixed a (valid) warning in RCONServer.
2013-12-28 22:00:01 +01:00
Tycho Bickerstaff
6d7b6ae9ca
fixes for mac os x
2013-12-22 15:17:36 +00:00
STRWarrior
318dc76fc9
Made the lure enchantment work.
2013-12-22 16:03:11 +01:00
madmaxoft
dfa81829fe
Fixed signedness warning in cItemGrid.
2013-12-22 15:45:45 +01:00
Mattes D
f404130e8c
Merge pull request #462 from mc-server/1.7_Fishing
...
1.7 fishing
2013-12-22 06:45:24 -08:00
STRWarrior
5f18abaa27
Fixed compiler warning.
2013-12-22 15:30:47 +01:00
STRWarrior
8d51c22b36
Fishing underground is slower and fishing while raining is faster.
2013-12-22 15:22:50 +01:00
STRWarrior
caccf72b46
Fixed compiler warnings.
2013-12-22 14:54:07 +01:00
STRWarrior
9de847c9b1
Countdown time is between 100 and 900 ticks.
2013-12-22 14:51:19 +01:00
STRWarrior
7a299f1ba6
Fishing now uses a countdown instead of a random number each tick.
2013-12-22 14:48:22 +01:00
Tycho Bickerstaff
d724241407
converted commneted paramater names to the unused macro
2013-12-22 13:46:55 +00:00
STRWarrior
e9d1352f6e
Implented BroadcastParticleEffect
2013-12-22 14:45:25 +01:00
Tycho Bickerstaff
94ca07cfbf
Merge branch 'master' of github.com:mc-server/MCServer
2013-12-22 13:19:27 +00:00
Tiger Wang
acb5a36a6a
Daylight sensors
2013-12-22 00:33:22 +00:00
Tiger Wang
5b2ac381b6
Fixed them again, confound it
2013-12-22 00:30:21 +00:00
STRWarrior
c676216791
Using regular assignments.
2013-12-21 22:20:54 +01:00
STRWarrior
76ff71810a
Once again better Y direction for the items given when fishing.
2013-12-21 20:42:43 +01: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
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
