madmaxoft
|
daade8ddee
|
Fixed multiple inheritance in ToLua++.
This fixes #422.
|
2013-12-16 22:13:46 +01:00 |
|
Tiger Wang
|
1d554677b4
|
Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures
Conflicts:
src/Bindings/Bindings.cpp
src/Bindings/Bindings.h
src/Blocks/BlockHandler.cpp
|
2013-12-08 14:02:45 +00:00 |
|
madmaxoft
|
044fd237b6
|
Moved bindings-related to a Bindings subfolder.
Ref.: #407
|
2013-12-08 12:17:54 +01:00 |
|
Tiger Wang
|
347e80bdd8
|
Added basic ender chests
Note that they just mirror chests now, so no per player inventory.
|
2013-12-07 00:18:58 +00:00 |
|
Tiger Wang
|
ee4d57a076
|
Fixed pickups spawning for BlockEntities
|
2013-12-06 19:17:57 +00:00 |
|
madmaxoft
|
012840360e
|
Moved json includes to where they are really needed.
|
2013-11-28 20:14:34 +01:00 |
|
madmaxoft
|
2113ca3844
|
Fixed VC2008 compilation, normalized include paths.
|
2013-11-27 09:17:25 +01:00 |
|
Alexander Harkness
|
d925cf4def
|
Fixed the remaining derps
|
2013-11-27 07:40:59 +00:00 |
|
Tiger Wang
|
32449f1fca
|
Further attempts to fix compile
|
2013-11-25 18:29:36 +00:00 |
|
Tiger Wang
|
e3db69c4ae
|
Attempt to fix compilation
|
2013-11-24 18:44:22 +00:00 |
|
Alexander Harkness
|
c3cd436ec3
|
Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts:
GNUmakefile
|
2013-11-24 14:37:03 +00:00 |
|
Alexander Harkness
|
675b4aa878
|
Moved source to src
|
2013-11-24 14:19:41 +00:00 |
|