Commit Graph

3597 Commits (39a1bcdea0a5897a7090748529e3b903918882ec)

Author SHA1 Message Date
Mattes D 194a1b208f Merge pull request #477 from mc-server/cmake-win
Cmake-win
2013-12-27 04:54:42 -08:00
madmaxoft f5c013071e Lua is built statically on *nix. 2013-12-27 12:01:45 +01:00
madmaxoft 66f9fcbb69 Fixed unix Lua dependencies. 2013-12-27 11:56:39 +01:00
madmaxoft 90213d324a Merge branch 'master' into cmake-win 2013-12-27 11:53:12 +01:00
madmaxoft 1cf6502be2 Made cmake compilation possible on Windows. 2013-12-27 11:51:08 +01:00
Alexander Harkness e3726a8bb3 Merge pull request #476 from mc-server/apidump-writingplugin
Writing a plugin APIDump article (#382)
2013-12-26 07:16:23 -08:00
Tiger Wang d41f724a40 Writing a plugin APIDump article (#382) 2013-12-26 15:11:48 +00:00
Mattes D 2450a3aee2 Merge pull request #474 from mc-server/deathmessages
Server now produces more detailed death messages
2013-12-26 07:03:59 -08:00
Tiger Wang f1142af455 Server now handles death messages 2013-12-26 14:55:19 +00:00
Mattes D ac0c024e31 Merge pull request #472 from mc-server/Extreme_Hills_M
Extreme hills
2013-12-26 06:20:31 -08:00
madmaxoft 2560fb40c6 Added proper precompiled headers for MSVC. 2013-12-26 14:54:46 +01:00
madmaxoft fb46ad5c75 Added cmake output folders (VC2008) to gitignore. 2013-12-26 14:53:03 +01:00
STRWarrior 6884d4235e Simplefied Extreme Hills M pattern select. 2013-12-26 14:37:48 +01:00
madmaxoft 5689c00131 cBlockArea: Fixed writing full-height areas. 2013-12-26 10:59:01 +01:00
Mattes D e0e01d0615 Merge pull request #461 from mc-server/repeaters
Repeaters, pressure plates, and others
2013-12-25 23:57:02 -08:00
Tiger Wang d0572e73a0 Moved increment operator to back of variables 2013-12-26 00:12:06 +00:00
STRWarrior b767fd784c Extreme Hills M biomes now generate gravel, stone and grass patterns. 2013-12-25 23:18:33 +01:00
STRWarrior e282eb73c8 Changed tbGravel. Vanilla has 3 layers of gravel and then stone. 2013-12-25 23:05:22 +01:00
STRWarrior caf3b6d70c Normal extreme hills (plus) now generate a stone/grass pattern. 2013-12-25 22:43:26 +01:00
STRWarrior 2f59a93f2a Re-added empty line. 2013-12-25 22:10:27 +01:00
STRWarrior 59b80c84fa This generates gravel in Extreme Hills M biomes. 2013-12-25 22:08:41 +01:00
Mattes D abbb82d442 Merge pull request #471 from mc-server/Fishing_Catapult
You are now able to sweep mobs to your position using fishing rods.
2013-12-25 11:48:26 -08:00
madmaxoft 77aaa5c367 Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer 2013-12-25 19:50:18 +01:00
madmaxoft c2befd9777 Fixed block area height check.
The block area couldn't be read up to chunk height.
2013-12-25 19:39:07 +01:00
tonibm19 4cee3d8fe3 (Hopefully) fixed if conditions 2013-12-25 19:32:45 +01:00
STRWarrior 5eacf327b7 Fixed Parentheses. 2013-12-25 18:14:00 +01:00
STRWarrior 17a84111ce You are now able to sweep mobs to your position using fishing rods. 2013-12-25 17:26:17 +01:00
Alexander Harkness e42008aa84 Merge pull request #470 from mc-server/mobileentitysaving
Preliminary mobile entity saving
2013-12-25 08:21:36 -08:00
Tiger Wang 548273c8f7 Preliminary mobile entity saving
* Fixes #252
* Alleviates #380
+ Adds mob saving
* Fixed some debug !ASSERTs
2013-12-25 16:07:52 +00:00
tonibm19 6b6b6e7498 Implemented xoft suggestion (partly)
I only get it working in first condition. It seems it's not compatible with else if...
2013-12-25 16:59:26 +01:00
Tiger Wang 1a02d94ed2 Fixed rails not updating with diagonals 2013-12-25 14:12:48 +00:00
Tiger Wang 40c2826a21 Braced up some code 2013-12-25 14:05:37 +00:00
Tiger Wang 508e505ace Used IsGamemodeCreative() function 2013-12-24 23:47:04 +00:00
tonibm19 258bb45880 BLOCKTYPE... 2013-12-24 19:31:32 +01:00
tonibm19 96c94a79a7 Fixed compilation 2013-12-24 19:25:34 +01:00
tonibm19 e3f89400d8 Implemented xoft suggestion 2013-12-24 19:13:18 +01:00
tonibm19 276f7dae5c Using BLOCKTYPE instead of int 2013-12-24 19:08:22 +01:00
tonibm19 0b49f896eb Added myself to contributors 2013-12-24 18:50:54 +01:00
tonibm19 59f8068cf4 Fixed comments 2013-12-24 18:41:49 +01:00
tonibm19 85fc1478fa Changed a little how detection works and added comments. 2013-12-24 18:37:09 +01:00
tonibm19 c06388aa4a Storing Y -1 and -2 blocks in a variable 2013-12-24 18:07:33 +01:00
Tiger Wang 9e5e415674 Merge pull request #469 from mc-server/Android_Update
Android update
2013-12-24 08:20:55 -08:00
Alexander Harkness f2d2b4fecb Merge pull request #468 from mc-server/colourchange
Update chat colours
2013-12-24 07:55:15 -08:00
Tiger Wang ae6cb01e56 Fixed comments in main.cpp and Player.cpp 2013-12-24 15:16:30 +00:00
Tiger Wang c6314e8935 Implemented stone and wooden pressure plates 2013-12-24 15:02:55 +00:00
Tiger Wang 89f87f66a5 Improved knockback animation
* Critical hits now actually increase damage
* Looking down at an entity and hitting them still produces upwards
motion (as per Vanilla experience)
* Reduced force to be more realistic
2013-12-24 15:02:35 +00:00
STRWarrior 6ad0da5ce0 Removed unneeded include. 2013-12-24 14:52:19 +01:00
STRWarrior b424877448 Fixed getting configure button going to port 0. 2013-12-24 14:44:24 +01:00
Alexander Harkness 200f37c41f removed the function def also 2013-12-24 13:26:54 +00:00
Alexander Harkness e1d3b201bd Finally removed the function. 2013-12-24 13:25:58 +00:00