cd35bd2c49
Fixed pistons being viable middle block
...
Also an excuse to update submodules
2013-12-11 18:42:38 +00:00
7035d31e9d
Merge pull request #417 from mc-server/WorldUpdate
...
World update
2013-12-11 08:02:45 -08:00
5a39dff904
HOOK_WORLD_STARTED now gets called when the CreateAndInitializeWorld function is used.
2013-12-11 16:19:38 +01:00
bba51755d4
ExpOrbs now move.
2013-12-11 16:14:08 +01:00
12bd5082b8
Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins.
2013-12-11 12:39:13 +01:00
5155aa4096
added zlib
2013-12-10 23:27:35 +00:00
d59e4e6a45
moved generating to globs
2013-12-10 23:22:34 +00:00
0925ead688
added UI folder
2013-12-10 23:20:39 +00:00
d5866a0978
moved Worldstorage to globs
2013-12-10 23:18:26 +00:00
77303b77c7
Merge branch 'master' of github.com:mc-server/MCServer into cmake
2013-12-10 23:10:50 +00:00
822a92a9b6
moved entities to globs
2013-12-10 23:09:16 +00:00
ec5af4cffe
moved mobs to globs
2013-12-10 23:07:30 +00:00
948fb78fa1
moved simulor to globs
2013-12-10 23:06:15 +00:00
40defa9d2d
removed leakfinder form build
2013-12-10 23:04:38 +00:00
dd633d5a94
Merge branch 'master' into cmake
2013-12-10 23:01:35 +00:00
78aca16d58
Exported the cTNTEntity
2013-12-14 16:28:17 +01:00
8a6c28b8f0
Merge pull request #423 from mc-server/redstoneimprovements
...
Redstone and configuration improvements
2013-12-14 06:41:00 -08:00
664676eedf
Merge branch 'master' of https://github.com/mc-server/MCServer
2013-12-14 12:51:27 +01:00
483ef89503
Fixed not getting XP from mobs.
2013-12-14 12:50:08 +01:00
d9a429ec64
Merge branch 'master' into quickfixs
2013-12-10 23:01:24 +00:00
712f7d5a23
added tolua++ command and removed stackwalker from build
2013-12-10 22:59:53 +00:00
daccfd9c6e
more cmake changes
2013-12-10 22:43:21 +00:00
572d48be52
removed more accedentailly commited object files
2013-12-10 21:47:23 +00:00
4300d0866d
removed accedentailly commited object files
2013-12-10 21:44:11 +00:00
6cdc990884
more cmake
2013-12-10 21:39:20 +00:00
9987611792
Provides a possible fix for repeater timings
...
Not completely reliable, but at least some types of clock work.
2013-12-10 21:24:02 +00:00
973999f524
fixed unused expression warnings in blockFire
2013-12-10 19:35:05 +00:00
d9ecf51f5b
more cmake stuff
2013-12-10 19:30:12 +00:00
c217ab5168
fixed comparison of thread handle to Null point rather than null handle
2013-12-10 18:43:54 +00:00
b91cfb8765
started work on cmake
2013-12-10 18:41:43 +00:00
7135bdf591
added abort to DeadlockDetector to generate core dumps on failure
2013-12-10 16:59:45 +00:00
5d2311bcff
Merge remote-tracking branch 'upstream/master'
2013-12-10 16:53:46 +00:00
9cfd8f6910
Merge pull request #412 from mc-server/fixes
...
Main feature: repeater delays!
2013-12-10 06:19:38 -08:00
e2e8c9624c
Readded initial line
2013-12-10 10:31:42 +00:00
b6e0234985
Fixed compile (alas, no more goto)
2013-12-10 10:29:36 +00:00
0905369fc7
Fixed Floody lava to stone fizzle
2013-12-10 00:29:59 +00:00
1dec73be0b
Added repeater delays
...
They DO sometimes get stuck though :P
2013-12-10 00:21:24 +00:00
ebad87d870
Slight redstone wire performance improvement
2013-12-09 23:48:06 +00:00
aecdfebf36
Changed more FastSetBlocks to SetBlocks
...
Fixes duplication bugs.
2013-12-09 23:43:26 +00:00
97a1147aca
Improved pickups spawning speed again
2013-12-09 23:43:06 +00:00
3712ee7b11
Fixed angle normalization typo.
2013-12-08 18:54:04 +01:00
4608beb3c6
Fixed tolua++ compilation.
...
Duplicate files, wrong includes, const-incorrect code...
2013-12-08 18:24:56 +01:00
fd68095acc
Fixed VS2008 compilation after those huge changes.
2013-12-08 18:13:30 +01:00
ac6b4cda7c
Merge pull request #408 from mc-server/SpawnPoint_Fix
...
Now spawn points will not be in deep oceans or rivers etc.
2013-12-08 09:07:49 -08:00
d85ea4f654
Now spawn points will not be in deep oceans or rivers etc.
2013-12-08 17:05:51 +01:00
9c1b7c8b6e
Readded redstone lamp handler
2013-12-08 14:07:32 +00:00
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
f64dd786aa
Fixed tabcompletion packet, fixes #356
2013-12-08 13:37:10 +00:00
6785bb7c16
Fixed normalizing large angles.
2013-12-08 13:08:56 +01:00
044fd237b6
Moved bindings-related to a Bindings subfolder.
...
Ref.: #407
2013-12-08 12:17:54 +01:00
62adb2b965
Fixed stationary water starting fires and flowing lava not.
2013-12-08 11:47:40 +01:00
0148685d4e
Fixed falling block metas, fixes #406
2013-12-08 00:32:02 +00:00
4c2490ed17
moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741
2013-12-08 00:13:31 +00:00
2942e57f93
reordered initalisation order at src/Generating/Cave.h line 73
2013-12-08 00:08:25 +00:00
e32a224fe3
fixed warnings in src/Generating/BioGen.cpp
...
removed unused variable at src/Generating/BioGen.cpp line 379
and added default fallthrough clause to switch at
src/Generating/BioGen.cpp line 725
2013-12-07 23:56:26 +00:00
c1dbe8a19e
added default fallthrough clause to switch at line 178 of src/UI/Window.cpp
2013-12-07 23:51:18 +00:00
ae369618ca
Reordered Listed Initalisation order in src/UI/Window.cpp
...
Reordered the Listed Initalisation order for CWindow to the
executed initalisation order. The compiler initalises values
in the order the fields are declared not the initalisations
listed
2013-12-07 23:51:18 +00:00
838d4d5d1d
Bonemeal has particles, fixes #393
2013-12-07 23:45:33 +00:00
cd7813f0f5
Removed unused variable ResultSlot
2013-12-07 23:33:18 +00:00
604c8fd9b9
Fix Undefined behavior at Bindings/LuaWindow line 32
2013-12-09 14:17:39 +00:00
187449824c
Fix Unused Variable Warning at FluidSimulator.cpp line 169 and 176
2013-12-09 14:15:30 +00:00
c78f67dcc0
Fixed warning unchecked enum value at Chunk.cpp line 841
2013-12-09 14:05:32 +00:00
a99bece3fa
Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54
2013-12-09 13:57:09 +00:00
b779d84663
Console trims its commands before executing 'em
2013-12-07 22:35:24 +00:00
405f67dac8
Fixed water starting fires
2013-12-07 22:35:01 +00:00
16db8533e1
Improved piston animations
2013-12-07 20:29:09 +00:00
5bed85aba0
Fixed some new 1.7 client crash bugs
...
Some technical blocks were removed; trying to render them as items
caused a crash.
2013-12-07 18:03:56 +00:00
a61082ffee
Changed some FastSetBlocks to SetBlock
...
Should fix some duplication glitches.
2013-12-07 14:55:19 +00:00
1932cc38a1
Fixed trapdoors not toggling
...
The redstone simulator kept on resetting them.
2013-12-07 14:41:58 +00:00
c0f091b1a3
Added a SpawnFallingBlock function so plugins can make other blocks fall.
2013-12-07 14:26:52 +01:00
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
30ead79049
Renamed animation function
...
Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just
players can have animations, you know.
2013-12-06 23:47:07 +00:00
a5dd0e2b88
Fixed bed leave animation
2013-12-06 22:45:55 +00:00
b028731726
Fixed duplication glitch with QueueSetBlock
...
If a coordinate was queued, and then the block there was broken, it
would reappear: double items!
Also now just sets meta if previous and current blocktypes matched.
2013-12-06 22:29:15 +00:00
b115f3d636
Added trapdoor cursor Y detection
2013-12-06 21:31:55 +00:00
ec226e00ab
Puking now uses GetEyeHeight()
2013-12-06 20:41:58 +00:00
e2a557f46c
Added pickup invalid item check
...
They aren't spawned at all if their itemtype isn't valid; possibly fixes
the client crashing with bad pickups.
2013-12-06 20:39:42 +00:00
126577214a
Re-implemented redstone duplicate checking
2013-12-06 20:33:48 +00:00
289e8cba21
Fixed eating using wrong animation
2013-12-06 20:28:27 +00:00
008c515b4b
Fixed trapdoors not overriding OnUse
2013-12-06 20:01:52 +00:00
6c7de446ae
Spawn eggs use IsGameMode()
...
Possible fix for #316 .
2013-12-06 20:00:49 +00:00
44d5fd1e87
Tools make a sound when breaking, fixes #266
2013-12-06 19:59:14 +00:00
77a7bfb3e5
Cleaned up torch code and added comments
2013-12-06 19:35:10 +00:00
73dd2e9bed
Removed another export and inline'd stuff
2013-12-06 19:24:45 +00:00
0376b847d7
Removed exporting of a torch function
2013-12-06 19:23:27 +00:00
57b8b38511
Updated comments for slabs
2013-12-06 19:22:25 +00:00
ee4d57a076
Fixed pickups spawning for BlockEntities
2013-12-06 19:17:57 +00:00
dde1c3a7cd
Merge pull request #394 from SamJBarney/master
...
Fire no longer goes out when on top of nether rack
2013-12-06 02:41:37 -08:00
1205c540ee
Added cPluginManager:GetCurrentPlugin() to Lua API.
2013-12-05 22:03:07 +01:00
d62bfdaca4
Merged if statements.
2013-12-05 10:01:23 -07:00
3d9396b097
Finished Merge
2013-12-05 07:34:56 -07:00
8acfe21503
Merge branch 'master' of https://github.com/mc-server/MCServer
...
Conflicts:
src/Simulator/FireSimulator.h
2013-12-05 07:32:19 -07:00
321b259213
ByteBuffer: Fixed optimization failures with threading checks.
2013-12-05 10:33:26 +01:00
9f1efbdf21
Hopefully fixed the sparc not being detected
2013-12-04 18:57:23 +00:00
e48168aa13
Lava can spawn fire.
...
Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65 .
2013-12-04 19:48:42 +01:00
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
efae54db0a
Made suggested changes
2013-12-03 19:05:34 -07:00
30906a597c
Fire no longer goes out when on top of nether rack
2013-12-02 14:11:45 -07:00
53d5eb09e0
Removed stray printf, again.
2013-12-02 09:56:42 -07:00
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
9e75df6a41
Removed stray printf.
2013-12-02 00:51:39 -07:00
458eff560b
Fixed 1.7 slab and stair placement.
2013-12-01 20:40:12 -07:00
ffd2caea66
Fixed compiler warnings in LightingThread.cpp.
2013-12-01 14:04:17 +01:00
3dfd051fcb
Fixed linux compile errors and formatting in RedstoneSimulator.cpp
2013-12-01 13:58:04 +01:00
bf30528ec4
DeadlockDetect is configurable now.
...
This is needed when debugging Lua plugins.
2013-11-30 22:14:47 +01:00
9a36564ce9
Fixed compiler warnings in IsBiomeNoDownfall().
2013-11-30 19:13:04 +01:00
2bbe5046e9
Merge pull request #387 from mc-server/trapdoors
...
Trapdoors, redstone fixes, and snow
2013-11-30 07:20:27 -08:00
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
c70c2fa42f
Changed cBlockHandler->OnUpdate() to use cChunk directly.
2013-11-30 15:58:27 +01:00
8eae5f2f3a
Added IsBiomeNoDownfall() function.
2013-11-30 15:57:56 +01:00
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
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
d12106ee97
Improved piston direction checking
...
Now uses AddFaceDirection, as suggested by xoft.
2013-11-30 13:41:40 +00:00
2383016b1d
Added the real tick duration to the OnWorldTick hook.
2013-11-30 14:22:26 +01:00
463de118a0
Grass doesn't spread to podzol or grassless dirt blocks.
2013-11-30 13:48:22 +01:00
754d991b4f
Added floor pattern for MegaTaiga biomes.
2013-11-30 13:34:52 +01:00
455686e3ad
Pistons no longer accept power through front face
...
This fixes #60 .
2013-11-30 12:11:39 +00:00
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
0e0baa940a
Properly fixed snow height, fixes #98 and #264
2013-11-30 00:31:21 +00:00
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
4741e5e794
Stairs reset meta when dropped, fixes #269
...
Additionally, they now have walking sounds.
2013-11-29 22:28:59 +00:00
1d69c80ad3
Implemented trapdoors, fixes #43 and #105
...
Also updated redstone simulator to support it
2013-11-29 22:27:08 +00:00
cee5160be8
Removed unneeded CPP files
...
Also removed unneeded #include in BlockStems
2013-11-29 22:25:07 +00:00
78f0195d26
Implemented mesa biomes in DistortedHeightmap CompoGen.
2013-11-29 21:47:09 +01:00
cbe8d1aa6d
Fixed CheckerboardBiomeGen in negative coords.
2013-11-29 21:45:20 +01:00
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
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
f027b71a31
Alpha-sorted BlockMetas, added red sand.
2013-11-29 18:38:27 +01:00
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
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
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
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
012840360e
Moved json includes to where they are really needed.
2013-11-28 20:14:34 +01:00
bdd86d7934
BiomeVisualiser: Added the TwoLevel biome generator.
2013-11-28 20:00:30 +01:00
96759637e9
Fixed a bug with TNT waking simulators
2013-11-28 18:24:25 +00:00
f9e1be0d57
Improved TNT pickup randomisation
2013-11-28 18:22:13 +00:00
994e1d7335
Made TNT pickups spawning chance 25%
2013-11-27 22:03:04 +00:00
a6630d3239
Merged master into redstonefixes
2013-11-27 21:35:13 +00:00
bec27617a2
Voronoi-related biomegens use the new cVoronoiMap class.
2013-11-27 21:42:34 +01:00
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
ac793df2ab
Added missing files for Voronoi map generation.
2013-11-27 14:26:28 +01:00
2113ca3844
Fixed VC2008 compilation, normalized include paths.
2013-11-27 09:17:25 +01:00
d925cf4def
Fixed the remaining derps
2013-11-27 07:40:59 +00:00
3b790bbf67
Fixed some of tiger's derpyness.
2013-11-27 07:27:19 +00:00
e1f3cb1879
ANOTHER compile fix
...
This one was broken by bear. :P
2013-11-26 22:56:35 +00:00
2ef9cf700d
Hopefully fixed last of the Linux compile errors
2013-11-26 22:50:33 +00:00
3e3e63d946
Compile fix again
2013-11-26 22:45:08 +00:00
f87bb1619e
Fixed Linux compile again
2013-11-26 22:43:22 +00:00
1c526ed52b
Fixed tolua++ files
2013-11-26 22:11:40 +00:00
0de95a215f
Merge remote-tracking branch 'origin/master' into foldermove2
...
Conflicts:
VC2008/MCServer.vcproj
2013-11-26 17:21:06 +00:00
139bd34690
Merge branch 'master' into foldermove2
2013-11-26 17:15:39 +00:00
770ef8c60b
Fixed loads more of them.
2013-11-26 17:14:46 +00:00
0b153f62f0
Another
2013-11-26 17:09:04 +00:00
a6b67e9cc1
And another.
2013-11-26 17:06:58 +00:00
c775011c98
Fixed another.
2013-11-26 17:06:26 +00:00
66482c9db7
Fixed another one.
2013-11-26 17:06:00 +00:00
f792117ce5
Fixed a mis-include
2013-11-26 17:04:07 +00:00
32449f1fca
Further attempts to fix compile
2013-11-25 18:29:36 +00:00
e3db69c4ae
Attempt to fix compilation
2013-11-24 18:44:22 +00:00
16435995a5
Moved SQLite, LuaExpat, and MD5 to /lib
2013-11-24 17:33:47 +00:00
c3cd436ec3
Merge remote-tracking branch 'origin/master' into foldermove2
...
Conflicts:
GNUmakefile
2013-11-24 14:37:03 +00:00
675b4aa878
Moved source to src
2013-11-24 14:19:41 +00:00
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
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
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
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
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
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
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
Tiger Wang
Mattes D
STRWarrior
Tycho Bickerstaff
Samuel Barney
Alexander Harkness
faketruth