summaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* removed leakfinder form buildTycho Bickerstaff2013-12-111-1/+1
|
* Merge branch 'master' into cmakeTycho Bickerstaff2013-12-1127-514/+603
|\
| * Exported the cTNTEntitySTRWarrior2013-12-144-9/+85
| |
| * Merge pull request #423 from mc-server/redstoneimprovementsMattes D2013-12-144-290/+158
| |\ | | | | | | Redstone and configuration improvements
| | * Fixed compilating!Tiger Wang2013-12-141-5/+5
| | |
| | * Improved player permissions loggingTiger Wang2013-12-141-1/+1
| | |
| | * Fixes to redstone wire and torchesTiger Wang2013-12-143-21/+37
| | | | | | | | | | | | | | | | | | + Wires now power blocks around the block beneath * Torches no longer power off if it is on a linked powered block * Enhanced code, split functions, etc.
| | * Groups.ini and Users.ini are now generatedTiger Wang2013-12-142-3/+25
| | |
| | * Removed loads of unneeded code againTiger Wang2013-12-141-86/+60
| | |
| | * Reduced loads of unneeded codeTiger Wang2013-12-141-188/+44
| | | | | | | | | | | | Merged wire powering detection code into a single function.
| * | Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2013-12-146-194/+236
| |\|
| | * Merge pull request #419 from mc-server/redstoneloadingMattes D2013-12-132-3/+17
| | |\ | | | | | | | | Redstone data is now loaded on chunk load
| | | * Improved redstone loading performanceTiger Wang2013-12-131-2/+10
| | | |
| | | * Fixed QueueSetBlock not sending to client changesTiger Wang2013-12-131-2/+1
| | | |
| | | * Redstone data is now loaded on chunk loadTiger Wang2013-12-132-0/+7
| | | |
| | * | Fixed threading issues affecting cProtocol172.madmaxoft2013-12-134-191/+219
| | | |
| * | | Fixed not getting XP from mobs.STRWarrior2013-12-142-1/+7
| |/ /
| * / Using "a_ClosestPlayer != NULL" in cExpOrb.STRWarrior2013-12-131-1/+1
| |/
| * Unknown packet type extended to 32 bits.madmaxoft2013-12-122-4/+4
| |
| * Fixed protocol 1.7 recovery after unknown packet.madmaxoft2013-12-121-4/+0
| |
| * Fixed pistons being viable middle blockTiger Wang2013-12-111-0/+3
| | | | | | | | Also an excuse to update submodules
| * Merge pull request #417 from mc-server/WorldUpdateMattes D2013-12-119-2/+99
| |\ | | | | | | World update
| | * HOOK_WORLD_STARTED now gets called when the CreateAndInitializeWorld function is used.STRWarrior2013-12-111-0/+1
| | |
| | * Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins.STRWarrior2013-12-119-2/+98
| | |
| * | ExpOrbs now move.STRWarrior2013-12-111-4/+8
| | |
| * | Provides a possible fix for repeater timingsTiger Wang2013-12-102-2/+2
| | | | | | | | | | | | Not completely reliable, but at least some types of clock work.
| * | added abort to DeadlockDetector to generate core dumps on failureTycho Bickerstaff2013-12-101-5/+2
| | |
* | | added tolua++ command and removed stackwalker from buildTycho Bickerstaff2013-12-103-6/+8
| | |
* | | more cmake changesTycho Bickerstaff2013-12-103-6/+15
| | |
* | | removed more accedentailly commited object filesTycho Bickerstaff2013-12-109-3985/+0
| | |
* | | removed accedentailly commited object filesTycho Bickerstaff2013-12-1027-0/+0
| | |
* | | more cmakeTycho Bickerstaff2013-12-1046-6/+4051
| | |
* | | more cmake stuffTycho Bickerstaff2013-12-103-2/+18
| | |
* | | started work on cmakeTycho Bickerstaff2013-12-104-0/+36
|/ /
* | Merge remote-tracking branch 'upstream/master'Tycho Bickerstaff2013-12-105-13/+96
|\|
| * Merge pull request #412 from mc-server/fixesMattes D2013-12-105-13/+96
| |\ | | | | | | Main feature: repeater delays!
| | * Readded initial lineTiger Wang2013-12-101-0/+1
| | |
| | * Fixed compile (alas, no more goto)Tiger Wang2013-12-101-11/+14
| | |
| | * Fixed Floody lava to stone fizzleTiger Wang2013-12-101-2/+16
| | |
| | * Added repeater delaysTiger Wang2013-12-102-1/+62
| | | | | | | | | | | | They DO sometimes get stuck though :P
| | * Slight redstone wire performance improvementTiger Wang2013-12-101-1/+6
| | |
| | * Changed more FastSetBlocks to SetBlocksTiger Wang2013-12-101-3/+3
| | | | | | | | | | | | Fixes duplication bugs.
| | * Improved pickups spawning speed againTiger Wang2013-12-102-7/+6
| | |
* | | moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741Tycho Bickerstaff2013-12-081-2/+4
| | |
* | | reordered initalisation order at src/Generating/Cave.h line 73Tycho Bickerstaff2013-12-081-2/+2
|/ /
* | fixed warnings in src/Generating/BioGen.cppTycho Bickerstaff2013-12-081-1/+1
| | | | | | | | | | | | removed unused variable at src/Generating/BioGen.cpp line 379 and added default fallthrough clause to switch at src/Generating/BioGen.cpp line 725
* | added default fallthrough clause to switch at line 178 of src/UI/Window.cppTycho Bickerstaff2013-12-081-0/+4
| |
* | Reordered Listed Initalisation order in src/UI/Window.cppTycho Bickerstaff2013-12-081-2/+2
| | | | | | | | | | | | | | 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
* | Removed unused variable ResultSlotTycho Bickerstaff2013-12-081-1/+0
| |
* | Fix Undefined behavior at Bindings/LuaWindow line 32worktycho2013-12-091-1/+4
| |
* | Fix Unused Variable Warning at FluidSimulator.cpp line 169 and 176worktycho2013-12-091-4/+3
| |
* | Fixed warning unchecked enum value at Chunk.cpp line 841worktycho2013-12-091-2/+4
| |
* | Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54worktycho2013-12-091-1/+4
|/
* Fixed angle normalization typo.madmaxoft2013-12-081-1/+1
|
* Fixed tolua++ compilation.madmaxoft2013-12-087-192/+5
| | | | Duplicate files, wrong includes, const-incorrect code...
* Fixed VS2008 compilation after those huge changes.madmaxoft2013-12-082-5/+7
|
* Merge pull request #408 from mc-server/SpawnPoint_FixMattes D2013-12-081-1/+1
|\ | | | | Now spawn points will not be in deep oceans or rivers etc.
| * Now spawn points will not be in deep oceans or rivers etc.STRWarrior2013-12-081-1/+1
| |
* | Readded redstone lamp handlerTiger Wang2013-12-081-0/+2
| |
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-0843-1251/+1348
|\| | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Fixed normalizing large angles.madmaxoft2013-12-084-8/+51
| |
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-0841-1238/+1237
| | | | | | | | Ref.: #407
| * Fixed stationary water starting fires and flowing lava not.madmaxoft2013-12-081-2/+2
| |
| * Added a SpawnFallingBlock function so plugins can make other blocks fall.STRWarrior2013-12-074-2/+93
| |
* | Fixed tabcompletion packet, fixes #356Tiger Wang2013-12-081-8/+4
| |
* | Fixed falling block metas, fixes #406Tiger Wang2013-12-081-1/+1
| |
* | Bonemeal has particles, fixes #393Tiger Wang2013-12-082-3/+8
| |
* | Console trims its commands before executing 'emTiger Wang2013-12-071-3/+3
| |
* | Fixed water starting firesTiger Wang2013-12-071-1/+0
| |
* | Improved piston animationsTiger Wang2013-12-071-4/+4
| |
* | Fixed some new 1.7 client crash bugsTiger Wang2013-12-074-1/+37
| | | | | | | | | | Some technical blocks were removed; trying to render them as items caused a crash.
* | Changed some FastSetBlocks to SetBlockTiger Wang2013-12-071-3/+3
| | | | | | | | Should fix some duplication glitches.
* | Fixed trapdoors not togglingTiger Wang2013-12-073-17/+103
| | | | | | | | The redstone simulator kept on resetting them.
* | Added basic ender chestsTiger Wang2013-12-0710-14/+355
| | | | | | | | Note that they just mirror chests now, so no per player inventory.
* | Renamed animation functionTiger Wang2013-12-0723-47/+82
| | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* | Fixed bed leave animationTiger Wang2013-12-061-1/+1
| |
* | Fixed duplication glitch with QueueSetBlockTiger Wang2013-12-067-16/+38
| | | | | | | | | | | | | | 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.
* | Added trapdoor cursor Y detectionTiger Wang2013-12-061-2/+0
| |
* | Puking now uses GetEyeHeight()Tiger Wang2013-12-061-1/+1
| |
* | Added pickup invalid item checkTiger Wang2013-12-061-0/+11
| | | | | | | | | | They aren't spawned at all if their itemtype isn't valid; possibly fixes the client crashing with bad pickups.
* | Re-implemented redstone duplicate checkingTiger Wang2013-12-061-0/+29
| |
* | Fixed eating using wrong animationTiger Wang2013-12-061-1/+1
| |
* | Fixed trapdoors not overriding OnUseTiger Wang2013-12-061-1/+1
| |
* | Spawn eggs use IsGameMode()Tiger Wang2013-12-061-2/+2
| | | | | | | | Possible fix for #316.
* | Tools make a sound when breaking, fixes #266Tiger Wang2013-12-062-2/+5
| |
* | Cleaned up torch code and added commentsTiger Wang2013-12-061-31/+7
| |
* | Removed another export and inline'd stuffTiger Wang2013-12-061-5/+5
| |
* | Removed exporting of a torch functionTiger Wang2013-12-061-3/+3
| |
* | Updated comments for slabsTiger Wang2013-12-061-5/+6
| |
* | Fixed pickups spawning for BlockEntitiesTiger Wang2013-12-061-1/+1
|/
* Merge pull request #394 from SamJBarney/masterMattes D2013-12-062-4/+8
|\ | | | | Fire no longer goes out when on top of nether rack
| * Merged if statements.Samuel Barney2013-12-051-7/+1
| |
| * Finished MergeSamuel Barney2013-12-051-2/+2
| |
| * Merge branch 'master' of https://github.com/mc-server/MCServerSamuel Barney2013-12-057-10/+97
| |\ | | | | | | | | | | | | Conflicts: src/Simulator/FireSimulator.h
| * | Made suggested changesSamuel Barney2013-12-042-6/+11
| | |
| * | Fire no longer goes out when on top of nether rackSamuel Barney2013-12-021-1/+6
| | |
* | | Added cPluginManager:GetCurrentPlugin() to Lua API.madmaxoft2013-12-051-7/+22
| |/ |/|
* | ByteBuffer: Fixed optimization failures with threading checks.madmaxoft2013-12-051-1/+1
| |
* | Hopefully fixed the sparc not being detectedAlexander Harkness2013-12-041-1/+3
| |
* | Lava can spawn fire.madmaxoft2013-12-045-8/+93
| | | | | | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65.
* | Fixed an error in cChunk's block ticking.madmaxoft2013-12-041-2/+2
|/ | | | Absolute coords were passed to a handler expecting relative coords.
* Removed stray printf, again.Samuel Barney2013-12-021-1/+0
|
* Switched to using provided ReadItem function.Samuel Barney2013-12-022-17/+12
| | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs.
* Removed stray printf.Samuel Barney2013-12-021-1/+0
|
* Fixed 1.7 slab and stair placement.Samuel Barney2013-12-021-0/+19
|
* Fixed compiler warnings in LightingThread.cpp.madmaxoft2013-12-011-2/+2
|
* Fixed linux compile errors and formatting in RedstoneSimulator.cppmadmaxoft2013-12-011-14/+26
|
* DeadlockDetect is configurable now.madmaxoft2013-11-303-7/+15
| | | | This is needed when debugging Lua plugins.
* Fixed compiler warnings in IsBiomeNoDownfall().madmaxoft2013-11-301-1/+4
|
* Merge pull request #387 from mc-server/trapdoorsMattes D2013-11-3020-330/+431
|\ | | | | Trapdoors, redstone fixes, and snow
| * Fixed pistons extendingTiger Wang2013-11-301-0/+10
| | | | | | | | They didn't when a source was in front, but now they do! Yay!
| * Removed redstone duplicate power checkingTiger Wang2013-11-301-2/+0
| | | | | | | | There was no need for it, and it introduced some bugs.
| * Improved piston direction checkingTiger Wang2013-11-301-62/+8
| | | | | | | | Now uses AddFaceDirection, as suggested by xoft.
| * Pistons no longer accept power through front faceTiger Wang2013-11-302-3/+96
| | | | | | | | This fixes #60.
| * Fixed thin snow CanBeAt checkingTiger Wang2013-11-301-1/+13
| | | | | | | | | | Now takes into account the possibility that thin snow can be on top of full thin snow.
| * Properly fixed snow height, fixes #98 and #264Tiger Wang2013-11-303-25/+53
| |
| * Improved redstone speed and fixed a wire bugTiger Wang2013-11-301-73/+83
| | | | | | | | | | | | | | | | 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.
| * Stairs reset meta when dropped, fixes #269Tiger Wang2013-11-291-2/+22
| | | | | | | | Additionally, they now have walking sounds.
| * Implemented trapdoors, fixes #43 and #105Tiger Wang2013-11-295-3/+131
| | | | | | | | Also updated redstone simulator to support it
| * Removed unneeded CPP filesTiger Wang2013-11-2911-221/+77
| | | | | | | | Also removed unneeded #include in BlockStems
* | Changed cBlockHandler->OnUpdate() to use cChunk directly.madmaxoft2013-11-3015-63/+117
| |
* | Added IsBiomeNoDownfall() function.madmaxoft2013-11-303-103/+164
| |
* | Explicitly set spawnpoint fixes.madmaxoft2013-11-301-20/+11
| | | | | | | | | | The value names are case-insensitive. The debug message is printed only once.
* | Added the real tick duration to the OnWorldTick hook.madmaxoft2013-11-308-17/+34
| |
* | Grass doesn't spread to podzol or grassless dirt blocks.madmaxoft2013-11-301-2/+3
| |
* | Added floor pattern for MegaTaiga biomes.madmaxoft2013-11-301-1/+10
| |
* | Implemented mesa biomes in DistortedHeightmap CompoGen.madmaxoft2013-11-293-21/+106
| |
* | Fixed CheckerboardBiomeGen in negative coords.madmaxoft2013-11-291-2/+3
| |
* | DistortedHeightmap: Improved speed, prepared for mesa biomes.madmaxoft2013-11-292-157/+424
| | | | | | | | This generates the rainbow-mesa as seen on the first mesa screenshot in the forum.
* | Fixed an off-by-one error in cByteBuffer.madmaxoft2013-11-291-1/+1
| | | | | | | | Could have caused random protocol errors and maybe even crashes.
* | Alpha-sorted BlockMetas, added red sand.madmaxoft2013-11-291-125/+128
| |
* | Trees will generate in the new biomes.madmaxoft2013-11-282-14/+101
| | | | | | | | Only the generic trees, the special variants haven't yet been implemented.
* | Added new biomes to old composition generator.madmaxoft2013-11-284-0/+145
| | | | | | | | Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators.
* | Added new biomes to old height generators.madmaxoft2013-11-284-39/+179
| | | | | | | | Now Biomal and DistortedHeight generators will work with new biomes.
* | Moved BiomeGen creation from INI file data to BioGen.cpp.madmaxoft2013-11-283-48/+74
| | | | | | | | This way it can be shared between MCServer and BiomeVisualiser.
* | Moved json includes to where they are really needed.madmaxoft2013-11-283-1/+2
| |
* | BiomeVisualiser: Added the TwoLevel biome generator.madmaxoft2013-11-282-0/+229
|/
* Fixed a bug with TNT waking simulatorsTiger Wang2013-11-281-2/+2
|
* Improved TNT pickup randomisationTiger Wang2013-11-281-1/+1
|
* Made TNT pickups spawning chance 25%Tiger Wang2013-11-272-3/+3
|
* Merged master into redstonefixesTiger Wang2013-11-27465-0/+138834
|\
| * Voronoi-related biomegens use the new cVoronoiMap class.madmaxoft2013-11-273-54/+29
| |
| * Fixed a load of issues, clang autodetection works now.Alexander Harkness2013-11-271-1/+0
| | | | | | | | | | | | | | | | 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?
| * Added missing files for Voronoi map generation.madmaxoft2013-11-272-0/+140
| |
| * Fixed VC2008 compilation, normalized include paths.madmaxoft2013-11-2712-12/+12
| |
| * Fixed the remaining derpsAlexander Harkness2013-11-2726-30/+30
| |
| * Fixed some of tiger's derpyness.Alexander Harkness2013-11-279-11/+11
| |
| * ANOTHER compile fixTiger Wang2013-11-261-1/+1
| | | | | | | | This one was broken by bear. :P
| * Hopefully fixed last of the Linux compile errorsTiger Wang2013-11-265-5/+5
| |
| * Compile fix againTiger Wang2013-11-261-1/+1
| |
| * Fixed Linux compile againTiger Wang2013-11-261-1/+1
| |
| * Fixed tolua++ filesTiger Wang2013-11-263-4/+4
| |
| * Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-2618-6/+268
| |\ | |/ |/| | | | | Conflicts: VC2008/MCServer.vcproj
| * Merge branch 'master' into foldermove2Alexander Harkness2013-11-261-3/+0
| |\ | |/ |/|
| * Fixed loads more of them.Alexander Harkness2013-11-2611-13/+13
| |
| * AnotherAlexander Harkness2013-11-261-1/+1
| |
| * And another.Alexander Harkness2013-11-261-1/+1
| |
| * Fixed another.Alexander Harkness2013-11-261-1/+1
| |
| * Fixed another one.Alexander Harkness2013-11-261-1/+1
| |
| * Fixed a mis-includeAlexander Harkness2013-11-261-1/+1
| |
| * Further attempts to fix compileTiger Wang2013-11-2524-27/+27
| |
| * Attempt to fix compilationTiger Wang2013-11-2448-59/+58
| |
| * Moved SQLite, LuaExpat, and MD5 to /libTiger Wang2013-11-248-148557/+0
| |
| * Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-2466-1497/+2365
| |\ | |/ |/| | | | | Conflicts: GNUmakefile
| * Moved source to srcAlexander Harkness2013-11-24469-0/+285880
|/
* Android: Moved Android stuff to the ~/trunk/Android/ folder!faketruth2012-08-191-267/+0
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@758 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Android: Finally a log! :Dfaketruth2012-08-191-32/+44
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@754 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Android: Showing last MCServer related logcat messagefaketruth2012-08-191-13/+63
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@753 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Android: I'm probably using a lot of bad practices, but the app looks somewhat better now and polls the server statusfaketruth2012-08-181-9/+146
| | | | | | 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
* Android: Pressing back button sends stop command to serverfaketruth2012-08-181-9/+30
| | | | | | | | 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
* MCServer should run just fine on Android now :Dfaketruth2012-08-161-3/+13
| | | | | | The server is also stoppable from Android git-svn-id: http://mc-server.googlecode.com/svn/trunk@743 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Compiles on Android! Added Eclipse project, import it into your workspace and it should be runnable on Android!faketruth2012-08-151-0/+37
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