1
0
Commit Graph

7970 Commits

Author SHA1 Message Date
Masy98
7903ee485e Added Rabbit.h and Rabbit.cpp to the CMakeList 2014-12-20 11:41:23 +01:00
Masy98
3d2b1875a1 Fixed Rabbit size 2014-12-20 10:38:56 +01:00
Masy98
6e8e1c6d8d Added Rabbits 2014-12-20 10:31:34 +01:00
Mattes D
ffd8356fc1 Merge pull request #1680 from Masy98/entities
Added Guardian
2014-12-19 23:37:35 +01:00
Masy98
5cfb6063c3 Fixed Guardians size and health 2014-12-19 16:06:43 +01:00
Masy98
f09c6701eb Guardian can now spawn if wanted!? 2014-12-18 20:44:39 +01:00
Masy98
706b9181e6 Merge branch 'master' into entities 2014-12-18 19:32:48 +01:00
Masy98
c836b52dd1 Added Entity Guardian 2014-12-18 19:30:32 +01:00
Mattes D
d253a9399e Merge pull request #1679 from SphinxC0re/master
Added itemblacklist to gitignore
2014-12-18 10:23:58 +01:00
Julian Laubstein
f6cb0e4cb2 Added itemblacklist to gitignore 2014-12-17 23:18:10 +01:00
Mattes D
5dfb094d6a Merge pull request #1677 from mc-server/GlobalFixes
Fixed eMonsterType lua bugs.
2014-12-17 21:25:46 +01:00
Howaner
c2926f8de1 derp 2014-12-17 20:08:55 +01:00
Howaner
fff108f20a Added comment. 2014-12-17 19:16:35 +01:00
Howaner
5c99f3fada Fixed eMonsterType lua bugs. 2014-12-17 17:28:24 +01:00
Mattes D
a7e115ee3e Merge pull request #1674 from gushromp/master
Fix for water spreading on bottom of the world
2014-12-17 14:53:41 +01:00
Ivan Đorđević
99055f644b Removed unneeded newlines 2014-12-17 11:25:59 +01:00
Mattes D
4947880a5d Merge pull request #1581 from mc-server/redstone
Resplit redstone .inc file and provided improvements
2014-12-17 08:38:23 +01:00
Tiger Wang
8d9049603b NULL -> nullptr 2014-12-16 23:18:59 +00:00
gushromp
c2d32ce31b Merge branch 'master' of https://github.com/gushromp/MCServer
Conflicts:
	src/Simulator/FloodyFluidSimulator.cpp
2014-12-16 22:58:23 +01:00
gushromp
fd325e3990 Fixed water from spreading on bottom of world 2014-12-16 22:54:39 +01:00
gushromp
6cf3aa70f1 Fixed water from spreading on bottom of world 2014-12-16 22:38:57 +01:00
Mattes D
aff32ba27b Updated Core. 2014-12-16 12:52:34 +01:00
Mattes D
6de847ef66 Merge pull request #1673 from gushromp/master
Updated cPlayer::DoMoveToWorld to send target world's weather info to Player
2014-12-15 20:16:25 +01:00
gushromp
b9977a39c3 Added braces to 'if' according to the code guidelines 2014-12-15 18:41:47 +01:00
blashyrk
4e5d2c36e9 Updated cPlayer::DoMoveToWorld to send target world's weather info to Player 2014-12-15 17:45:42 +01:00
Howaner
b3e5872c22 Fixed mob invisibility 2014-12-14 17:48:30 +01:00
Mattes D
81446b0f80 Merge pull request #1635 from mc-server/Cocoa
Added cocoa pod.
2014-12-14 17:39:50 +01:00
Franz Reiter
352063b63f Merge pull request #1670 from Masy98/crafting
Fixed fence/-gates and door recipes and added baked potato recipe
2014-12-14 16:58:12 +01:00
Masy98
5005c01f4c Fixed fence/-gates and door recipes and added baked potato recipe 2014-12-14 16:01:06 +01:00
Howaner
6436fe73ca Merge branch 'master' into Cocoa 2014-12-14 13:14:58 +01:00
Howaner
bed456033f "& 0x0f" isn't needed 2014-12-14 13:14:48 +01:00
Tycho
7542255d5c Clang needs the libstdc++ that comes with gcc-4.8 2014-12-13 22:12:53 +00:00
Tycho
aef36a5c19 final syntax errors 2014-12-13 21:33:16 +00:00
Tycho
946adeac3b Double equals 2014-12-13 21:26:38 +00:00
Tycho
0e1ef05ea8 Fix forgoten thens 2014-12-13 21:22:15 +00:00
Tycho
3d9c88affa "Don't set compiler to gcc on clang builds" 2014-12-13 20:58:28 +00:00
Mattes D
58668351ae Merge pull request #1664 from mc-server/SandstoneCaves
WormNestCaves occasionally generates sandstone around the cave
2014-12-13 20:43:17 +01:00
Howaner
2a8c234f46 Fixes 2014-12-13 20:31:37 +01:00
Howaner
a595a4a842 Merge branch 'master' into Cocoa 2014-12-13 20:10:23 +01:00
Alexander Harkness
72b38c284f Merge pull request #1663 from mc-server/APIDumpSize
APIDump Width
2014-12-13 14:39:22 +00:00
STRWarrior
00bee25b4b WormNestCaves occasionally generates sandstone around the cave
Only when the block around the cave is sand.
2014-12-13 15:38:37 +01:00
STRWarrior
3fb10f064c Made comment in example code smaller
It caused the whole page to extend beyond the max width
2014-12-13 15:34:46 +01:00
STRWarrior
4f2931dd39 Reverted main_APIDump.lua changes 2014-12-13 15:33:51 +01:00
Tiger Wang
17be0e3b7a Removed test 2014-12-13 12:17:04 +00:00
Tiger Wang
4b20a61519 Merge branch 'master' into redstone 2014-12-13 12:11:01 +00:00
STRWarrior
f62a0e137e Fixed the width sometimes going over the div size 2014-12-13 12:59:23 +01:00
Mattes D
b8072cbd62 Merge pull request #1660 from Seadragon91/master
Fixed print of milliseconds from chrono
2014-12-12 21:00:06 +01:00
Lukas Pioch
ece8b8ac96 Fixed print of milliseconds from chrono 2014-12-12 15:10:29 +01:00
Mattes D
125c70ab63 Updated the Core. 2014-12-12 14:33:11 +01:00
Mattes D
c8a49a6189 LightingThread: Fixed a memory leak. 2014-12-12 14:27:19 +01:00