1
0
Commit Graph

5674 Commits

Author SHA1 Message Date
madmaxoft
be1cdadda7 Fixed an error in cChunk's block ticking.
Absolute coords were passed to a handler expecting relative coords.
2013-12-04 19:47:08 +01:00
Samuel Barney
efae54db0a Made suggested changes 2013-12-03 19:05:34 -07:00
Samuel Barney
30906a597c Fire no longer goes out when on top of nether rack 2013-12-02 14:11:45 -07:00
Samuel Barney
53d5eb09e0 Removed stray printf, again. 2013-12-02 09:56:42 -07:00
Samuel Barney
050702eaa1 Switched to using provided ReadItem function.
Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs.
2013-12-02 09:32:28 -07:00
Samuel Barney
9e75df6a41 Removed stray printf. 2013-12-02 00:51:39 -07:00
Samuel Barney
458eff560b Fixed 1.7 slab and stair placement. 2013-12-01 20:40:12 -07:00
madmaxoft
ffd2caea66 Fixed compiler warnings in LightingThread.cpp. 2013-12-01 14:04:17 +01:00
madmaxoft
3dfd051fcb Fixed linux compile errors and formatting in RedstoneSimulator.cpp 2013-12-01 13:58:04 +01:00
madmaxoft
bf30528ec4 DeadlockDetect is configurable now.
This is needed when debugging Lua plugins.
2013-11-30 22:14:47 +01:00
madmaxoft
9a36564ce9 Fixed compiler warnings in IsBiomeNoDownfall(). 2013-11-30 19:13:04 +01:00
Mattes D
2bbe5046e9 Merge pull request #387 from mc-server/trapdoors
Trapdoors, redstone fixes, and snow
2013-11-30 07:20:27 -08:00
Tiger Wang
fad43f0c40 Fixed pistons extending
They didn't when a source was in front, but now they do! Yay!
2013-11-30 15:07:21 +00:00
madmaxoft
c70c2fa42f Changed cBlockHandler->OnUpdate() to use cChunk directly. 2013-11-30 15:58:27 +01:00
madmaxoft
8eae5f2f3a Added IsBiomeNoDownfall() function. 2013-11-30 15:57:56 +01:00
madmaxoft
78f9d97459 Explicitly set spawnpoint fixes.
The value names are case-insensitive.
The debug message is printed only once.
2013-11-30 15:03:29 +01:00
Tiger Wang
363db1bdc4 Removed redstone duplicate power checking
There was no need for it, and it introduced some bugs.
2013-11-30 13:52:11 +00:00
Tiger Wang
d12106ee97 Improved piston direction checking
Now uses AddFaceDirection, as suggested by xoft.
2013-11-30 13:41:40 +00:00
madmaxoft
2383016b1d Added the real tick duration to the OnWorldTick hook. 2013-11-30 14:22:26 +01:00
madmaxoft
463de118a0 Grass doesn't spread to podzol or grassless dirt blocks. 2013-11-30 13:48:22 +01:00
madmaxoft
754d991b4f Added floor pattern for MegaTaiga biomes. 2013-11-30 13:34:52 +01:00
Tiger Wang
455686e3ad Pistons no longer accept power through front face
This fixes #60.
2013-11-30 12:11:39 +00:00
Tiger Wang
ab382ef6b4 Fixed thin snow CanBeAt checking
Now takes into account the possibility that thin snow can be on top of
full thin snow.
2013-11-30 11:45:23 +00:00
Tiger Wang
0e0baa940a Properly fixed snow height, fixes #98 and #264 2013-11-30 00:31:21 +00:00
Tiger Wang
8d88c8f26f Improved redstone speed and fixed a wire bug
The redstone simulator no longer goes through the Powered and
LinkedPowered blocks lists for EVERY item in the chunk data, instead,
only at every tick.
Also, wires powering each other that had the same data value is now
fixed.
2013-11-30 00:30:49 +00:00
Tiger Wang
4741e5e794 Stairs reset meta when dropped, fixes #269
Additionally, they now have walking sounds.
2013-11-29 22:28:59 +00:00
Tiger Wang
1d69c80ad3 Implemented trapdoors, fixes #43 and #105
Also updated redstone simulator to support it
2013-11-29 22:27:08 +00:00
Tiger Wang
cee5160be8 Removed unneeded CPP files
Also removed unneeded #include in BlockStems
2013-11-29 22:25:07 +00:00
madmaxoft
78f0195d26 Implemented mesa biomes in DistortedHeightmap CompoGen. 2013-11-29 21:47:09 +01:00
madmaxoft
cbe8d1aa6d Fixed CheckerboardBiomeGen in negative coords. 2013-11-29 21:45:20 +01:00
madmaxoft
9b881a15ef DistortedHeightmap: Improved speed, prepared for mesa biomes.
This generates the rainbow-mesa as seen on the first mesa screenshot in the forum.
2013-11-29 18:42:56 +01:00
madmaxoft
3963a72046 Fixed an off-by-one error in cByteBuffer.
Could have caused random protocol errors and maybe even crashes.
2013-11-29 18:39:40 +01:00
madmaxoft
f027b71a31 Alpha-sorted BlockMetas, added red sand. 2013-11-29 18:38:27 +01:00
madmaxoft
f6df5cea87 Trees will generate in the new biomes.
Only the generic trees, the special variants haven't yet been implemented.
2013-11-28 22:08:42 +01:00
madmaxoft
057821d9b7 Added new biomes to old composition generator.
Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators.
2013-11-28 21:51:18 +01:00
madmaxoft
95ab73e4ed Added new biomes to old height generators.
Now Biomal and DistortedHeight generators will work with new biomes.
2013-11-28 21:15:50 +01:00
madmaxoft
c0a6c2b533 Moved BiomeGen creation from INI file data to BioGen.cpp.
This way it can be shared between MCServer and BiomeVisualiser.
2013-11-28 20:15:52 +01:00
madmaxoft
012840360e Moved json includes to where they are really needed. 2013-11-28 20:14:34 +01:00
madmaxoft
bdd86d7934 BiomeVisualiser: Added the TwoLevel biome generator. 2013-11-28 20:00:30 +01:00
Tiger Wang
96759637e9 Fixed a bug with TNT waking simulators 2013-11-28 18:24:25 +00:00
Tiger Wang
f9e1be0d57 Improved TNT pickup randomisation 2013-11-28 18:22:13 +00:00
Tiger Wang
994e1d7335 Made TNT pickups spawning chance 25% 2013-11-27 22:03:04 +00:00
Tiger Wang
a6630d3239 Merged master into redstonefixes 2013-11-27 21:35:13 +00:00
madmaxoft
bec27617a2 Voronoi-related biomegens use the new cVoronoiMap class. 2013-11-27 21:42:34 +01:00
Alexander Harkness
596963743e Fixed a load of issues, clang autodetection works now.
This fixes issue #210.
This also removes the disableasm option, so it would be wise to remove
it from any scripts that use it.
I also removed a random line in the middle of globals.h, why was it
there?
2013-11-27 17:18:40 +00:00
madmaxoft
ac793df2ab Added missing files for Voronoi map generation. 2013-11-27 14:26:28 +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
Alexander Harkness
3b790bbf67 Fixed some of tiger's derpyness. 2013-11-27 07:27:19 +00:00
Tiger Wang
e1f3cb1879 ANOTHER compile fix
This one was broken by bear. :P
2013-11-26 22:56:35 +00:00
Tiger Wang
2ef9cf700d Hopefully fixed last of the Linux compile errors 2013-11-26 22:50:33 +00:00
Tiger Wang
3e3e63d946 Compile fix again 2013-11-26 22:45:08 +00:00
Tiger Wang
f87bb1619e Fixed Linux compile again 2013-11-26 22:43:22 +00:00
Tiger Wang
1c526ed52b Fixed tolua++ files 2013-11-26 22:11:40 +00:00
Alexander Harkness
0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts:
	VC2008/MCServer.vcproj
2013-11-26 17:21:06 +00:00
Alexander Harkness
139bd34690 Merge branch 'master' into foldermove2 2013-11-26 17:15:39 +00:00
Alexander Harkness
770ef8c60b Fixed loads more of them. 2013-11-26 17:14:46 +00:00
Alexander Harkness
0b153f62f0 Another 2013-11-26 17:09:04 +00:00
Alexander Harkness
a6b67e9cc1 And another. 2013-11-26 17:06:58 +00:00
Alexander Harkness
c775011c98 Fixed another. 2013-11-26 17:06:26 +00:00
Alexander Harkness
66482c9db7 Fixed another one. 2013-11-26 17:06:00 +00:00
Alexander Harkness
f792117ce5 Fixed a mis-include 2013-11-26 17:04:07 +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
Tiger Wang
16435995a5 Moved SQLite, LuaExpat, and MD5 to /lib 2013-11-24 17:33:47 +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
faketruth
01a4ab7726 Android: Moved Android stuff to the ~/trunk/Android/ folder!
git-svn-id: http://mc-server.googlecode.com/svn/trunk@758 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-19 16:43:47 +00:00
faketruth
e5bef782fc Android: Finally a log! :D
git-svn-id: http://mc-server.googlecode.com/svn/trunk@754 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-19 00:35:19 +00:00
faketruth
cc13cbbe3d Android: Showing last MCServer related logcat message
git-svn-id: http://mc-server.googlecode.com/svn/trunk@753 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-18 23:42:27 +00:00
faketruth
b6138129e6 Android: I'm probably using a lot of bad practices, but the app looks somewhat better now and polls the server status
Android: Put quite some testing code in ToJava.h and app-android.cpp ... I still can't send log messages to Java. The issue is threads, I can't use JNI stuff from threads that were not created by Java (at least not easily)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@752 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-18 21:00:51 +00:00
faketruth
c40af4c4ab Android: Pressing back button sends stop command to server
Android: ToJava can call functions on Java by using JNI
Android: Plugins work
Android: Added android specific files to VS2008 project, but they are excluded from compiling

git-svn-id: http://mc-server.googlecode.com/svn/trunk@747 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-17 22:20:35 +00:00
faketruth
33ca4d5003 MCServer should run just fine on Android now :D
The server is also stoppable from Android

git-svn-id: http://mc-server.googlecode.com/svn/trunk@743 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-16 20:28:14 +00:00
faketruth
d21e4dacf7 Compiles on Android! Added Eclipse project, import it into your workspace and it should be runnable on Android!
Disabled Squirrel for Android
cLog now logs to Android LogCat as well
Fixed Lua so it compiles on Android
Removed/commented out exceptions in JsonCpp so it compiles on Android

git-svn-id: http://mc-server.googlecode.com/svn/trunk@741 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-08-15 21:24:11 +00:00