Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed IsOn | wiseoldman95 | 2014-04-07 | 1 | -3/+2 |
| | |||||
* | Removed stray IsLocked | wiseoldman95 | 2014-04-07 | 1 | -2/+2 |
| | |||||
* | Removed unneeded spacings | wiseoldman95 | 2014-04-07 | 1 | -6/+3 |
| | |||||
* | Slight cleanup | wiseoldman95 | 2014-04-07 | 1 | -13/+17 |
| | | | It is more efficient and readable if we do nothing unless we're not locked. | ||||
* | Fixed some more minor issues with the redstone simulator. | Alexander Harkness | 2014-04-07 | 1 | -34/+39 |
| | |||||
* | Improved the speed a little more. | Alexander Harkness | 2014-04-07 | 1 | -1/+1 |
| | |||||
* | Fixed the redstone simulator. | Alexander Harkness | 2014-04-07 | 1 | -49/+40 |
| | |||||
* | Fix some of the comments in the PR tycho just did. | Alexander Harkness | 2014-04-07 | 1 | -8/+6 |
| | |||||
* | Added support for redstone latching | Tycho | 2014-04-06 | 2 | -2/+65 |
| | | | | fixes #856 | ||||
* | Merge pull request #838 from mc-server/lilypads | worktycho | 2014-03-30 | 1 | -0/+1 |
|\ | | | | | Lilypads | ||||
| * | Some fixes to lilypads | Tiger Wang | 2014-03-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | * Fixed placement on lava * Fixed placement on side of blocks * Fixed placement through blocks + Added washing-away of pads + Added ice as a block that fully occupies its voxel | ||||
* | | Fixed compilation after last PR merge. | madmaxoft | 2014-03-28 | 1 | -1/+1 |
| | | |||||
* | | Change SpreadSource prefix to ss | Howaner | 2014-03-27 | 1 | -1/+1 |
| | | |||||
* | | Add SpreadSource | Howaner | 2014-03-27 | 1 | -1/+1 |
| | | |||||
* | | Add HOOK_BLOCK_SPREAD | Howaner | 2014-03-27 | 1 | -3/+11 |
|/ | |||||
* | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-18 | 4 | -10/+21 |
|\ | | | | | | | | | Conflicts: src/ChunkMap.cpp | ||||
| * | Fixed double to float conversions. | madmaxoft | 2014-03-16 | 1 | -1/+1 |
| | | |||||
| * | Unified Vector classes | andrew | 2014-03-11 | 2 | -2/+1 |
| | | |||||
| * | Merge pull request #779 from mc-server/tntburnexplode | Alexander Harkness | 2014-03-10 | 1 | -7/+19 |
| |\ | | | | | | | TNT explodes when consumed by fire | ||||
| | * | Fixed compile | Tiger Wang | 2014-03-10 | 1 | -1/+2 |
| | | | |||||
| | * | Removed uneeded meta obtain | Tiger Wang | 2014-03-09 | 1 | -3/+1 |
| | | | |||||
| | * | TNT explodes when consumed by fire | Tiger Wang | 2014-03-09 | 1 | -6/+19 |
| | | | | | | | | | | | | Fixed FS#406 | ||||
* | | | Merge remote-tracking branch 'origin/master' into awesometnt | Tiger Wang | 2014-03-10 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | Merge pull request #768 from Howaner/BlockEntitys | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Add TNT load/save | ||||
| | * | | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-08 | 4 | -10/+291 |
| | |\| | |||||
| | * | | Change TNT Fuse to ticks | Howaner | 2014-03-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-10 | 6 | -16/+295 |
|\| | | | |||||
| * | | | Fixed issues with int vs size_t and a few other warnings | Tycho | 2014-03-08 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Added some comments | andrew | 2014-03-07 | 2 | -1/+6 |
| | | | |||||
| * | | Fixed water/lava interaction | andrew | 2014-03-07 | 3 | -4/+69 |
| | | | |||||
| * | | Merge remote-tracking branch 'xdot/master' | madmaxoft | 2014-03-06 | 4 | -8/+219 |
| |\ \ | | |/ | |/| | |||||
| | * | Implemented vanilla-like fluid simulator | andrew | 2014-03-05 | 4 | -8/+219 |
| | | | |||||
| * | | Merge pull request #746 from Howaner/Slabs | Mattes D | 2014-03-03 | 1 | -5/+3 |
| |\ \ | | |/ | |/| | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | ||||
| | * | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | Howaner | 2014-03-02 | 1 | -5/+3 |
| | | | |||||
* | | | Added extra awesomeness to TNT | Tiger Wang | 2014-03-05 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | + TNT now has a chance of flinging FallingBlock entities around * Improved TNT damage * Improved TNT spawning visuals * Possible fix for 'SetSwimState failure' messages in debug | ||||
* | | Merge pull request #738 from xdot/master | Mattes D | 2014-03-02 | 3 | -4/+4 |
|\ \ | |/ |/| | Refactored global block property arrays | ||||
| * | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 3 | -4/+4 |
| | | |||||
* | | Fix Double Slabs, fix Slab Meta and add more things to burnable | Howaner | 2014-02-28 | 1 | -0/+13 |
|/ | |||||
* | Removed problematic utf8. | madmaxoft | 2014-02-20 | 1 | -2/+2 |
| | |||||
* | Bad UTF-8 o.O | Howaner | 2014-02-20 | 1 | -2/+2 |
| | |||||
* | Remove typeinfo import in IncrementalRedstoneSimulator | Howaner | 2014-02-20 | 1 | -2/+0 |
| | |||||
* | Add Pressure Plate Sound | Howaner | 2014-02-20 | 1 | -0/+9 |
| | |||||
* | Add Light weighted pressure plates | Howaner | 2014-02-20 | 2 | -10/+20 |
| | |||||
* | Add Hay Bale to Burnable | Howaner | 2014-02-20 | 1 | -0/+1 |
| | |||||
* | Fixed a glaring bug with chunk cross-simulating | Tiger Wang | 2014-02-16 | 1 | -9/+17 |
| | | | | | | * A chunk's redstone blocks list is no longer touched if AddBlock was being called with another chunk's coordinates * Fixed chunk boundary checks | ||||
* | Added a 'default:' for SimChunk()'s switch | Tiger Wang | 2014-02-15 | 1 | -0/+1 |
| | |||||
* | A fix and an improvement | Tiger Wang | 2014-02-15 | 2 | -23/+43 |
| | | | | | | | | * Fixed a special case with the wrong ChunkX/Z values being used to calculate a relative position * Simplified data structure adding and removing operations (no more pointers!) - Removed one character of whitespace :D | ||||
* | Sizeable speed improvements to redstone | Tiger Wang | 2014-02-15 | 2 | -81/+115 |
| | | | | | | | | | | | | | + Moved all simulator data into individual chunks * Cleaned up parameters for functions and some code * Fixed repeaters powering off faster than they power on The main issue before was that, although the redstone simulator stored blocks to be simulated in individual cChunks, other data, such as powered lists, and etcetera, were global regardless of which chunk was being simulated. Therefore, with worlds with lots of redstone, each tick saw the ticking of chunks, which themselves iterated through the entire dataset needlessly, creating LOTS of lag. Should be better now :) | ||||
* | Add more Sounds to Redstone Simulator | Howaner | 2014-02-15 | 1 | -1/+23 |
| | |||||
* | Add Fence Gate to Redstone Simulator | Howaner | 2014-02-15 | 2 | -0/+31 |
| | |||||
* | Improved pressure plates | Tiger Wang | 2014-02-12 | 2 | -1/+5 |
| | | | | | + Two (or more) pressure plates can be triggered at the same time * Fixed issues caused by pressure plates not being in the sources list | ||||
* | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later). | STRWarrior | 2014-02-07 | 7 | -1809/+1809 |
| | |||||
* | Fixed some end of lines | STRWarrior | 2014-02-07 | 2 | -2/+2 |
| | |||||
* | Implemented an easy way of adding new redstone simulators. | STRWarrior | 2014-02-07 | 4 | -3/+79 |
| | | | | Also added a "noop" redstone simulator that does the same as the fluid version. | ||||
* | Fixed most of the reordering warnings | Tycho | 2014-02-05 | 1 | -3/+3 |
| | |||||
* | Improved Type safety of eBlockFace | Tycho | 2014-02-04 | 1 | -2/+3 |
| | | | | May Fix #640 | ||||
* | Removed unused lookups | Tycho | 2014-02-03 | 1 | -2/+0 |
| | |||||
* | Merge pull request #602 from mc-server/improvementsandfixes | Mattes D | 2014-02-03 | 2 | -13/+14 |
|\ | | | | | Redstone crash fix and current console line replace function | ||||
| * | Split cCoord template into one and two data types | Tiger Wang | 2014-02-01 | 1 | -2/+2 |
| | | |||||
| * | Fixed redstone simulator crash found in #570 | Tiger Wang | 2014-01-29 | 2 | -13/+14 |
| | | |||||
* | | Changed Signiture of OnUpdate | Tycho | 2014-02-02 | 1 | -1/+7 |
| | | |||||
* | | Changed pointers to references | Tycho | 2014-02-01 | 1 | -2/+2 |
| | | |||||
* | | Changed signitures of Several BLockHandler Methods | Tycho | 2014-02-01 | 1 | -2/+4 |
|/ | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check | ||||
* | Basic command block implementation | andrew | 2014-01-18 | 2 | -1/+30 |
| | |||||
* | Fixed wire, rail, and pressure plate unpowering | Tiger Wang | 2014-01-13 | 1 | -3/+4 |
| | |||||
* | Fixed rails powering | Tiger Wang | 2014-01-11 | 1 | -0/+2 |
| | |||||
* | Did some stuff with the vectors | Tiger Wang | 2014-01-11 | 1 | -32/+17 |
| | |||||
* | Fixed a door bug and reduced code | Tiger Wang | 2014-01-11 | 1 | -19/+1 |
| | | | | | Doors wouldn't get powered by repeaters, and some blocks, like glass, were viable middle blocks when they shouldn't have been. | ||||
* | Fixed doors, fixes #453 | Tiger Wang | 2014-01-10 | 1 | -38/+8 |
| | |||||
* | Major refactoring of redstone | Tiger Wang | 2014-01-10 | 2 | -185/+178 |
| | | | | | | | | | | | | | | | | | | | | This commit is a refactoring of the redstone code, mainly the functions handling the removal of invalid blocks from power supplier data structures. Its aim is to improve performance and potentially reduce the memory footprint of the data structures. It works to reduce the amount of GetBlock()s triggered every tick. Before, a GetBlock() was requested for every single item in the data lists, as well as for every single redstone block in a chunk. Following these changes, the AddBlock() event is utilised more effectively to only update the lists when needed (a block is changed), as well as to insert the block type (and update it when needed) alongside the coordinates into the main redstone simulator chunkdata list. In short, a single GetBlock() is now cached, with this cache being updated when the simulator is awoken due to a block change. At least, I *hope* that this is what it does :P | ||||
* | fixed warnings in World.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -2/+8 |
| | |||||
* | converted commneted paramater names to the unused macro | Tycho Bickerstaff | 2013-12-22 | 4 | -5/+11 |
| | |||||
* | Merge branch 'master' of github.com:mc-server/MCServer | Tycho Bickerstaff | 2013-12-22 | 2 | -20/+161 |
|\ | |||||
| * | Merge pull request #461 from mc-server/repeaters | Mattes D | 2013-12-26 | 2 | -20/+161 |
| |\ | | | | | | | Repeaters, pressure plates, and others | ||||
| | * | Moved increment operator to back of variables | Tiger Wang | 2013-12-26 | 1 | -9/+9 |
| | | | |||||
| | * | Implemented stone and wooden pressure plates | Tiger Wang | 2013-12-24 | 2 | -3/+105 |
| | | | |||||
| | * | Provides an enhancement to daylight sensors | Tiger Wang | 2013-12-23 | 1 | -2/+27 |
| | | | |||||
| | * | Daylight sensor sensing enhancement | Tiger Wang | 2013-12-23 | 1 | -9/+11 |
| | | | |||||
| | * | A fix for daylight sensors | Tiger Wang | 2013-12-22 | 1 | -2/+3 |
| | | | |||||
| | * | Daylight sensors | Tiger Wang | 2013-12-22 | 1 | -2/+1 |
| | | | |||||
| | * | Fixed them again, confound it | Tiger Wang | 2013-12-22 | 1 | -9/+21 |
| | | | |||||
* | | | Piston is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 3 | -4/+4 |
| | | | |||||
* | | | ChunkSender is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 1 | -1/+2 |
|/ / | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-21 | 2 | -12/+38 |
|\| | |||||
| * | Fixed repeaters delay, maybe | Tiger Wang | 2013-12-20 | 2 | -12/+38 |
| | | | | | | | | | | Also added basic daylight sensors, though because GetBlockSkylight always is 15, it doesn't work. | ||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-20 | 3 | -6/+6 |
|\| | |||||
| * | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 3 | -6/+6 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 1 | -11/+41 |
|\| | |||||
| * | Fixed repeaters not updating power | Tiger Wang | 2013-12-19 | 1 | -11/+41 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-18 | 2 | -116/+196 |
|\| | |||||
| * | Fixed wire powering blocks beneath | Tiger Wang | 2013-12-18 | 1 | -1/+1 |
| | | |||||
| * | Fixed bad repeater power queuing in corner case | Tiger Wang | 2013-12-18 | 2 | -83/+76 |
| | | | | | | | | | | Repeaters remain queued to power even if their original source has since unpowered. Also functionised and cleaned up code. | ||||
| * | Implemented xoft's suggestions | Tiger Wang | 2013-12-15 | 1 | -3/+16 |
| | | |||||
| * | Fixed wire repeater checking | Tiger Wang | 2013-12-15 | 1 | -1/+1 |
| | | |||||
| * | Wires now power repeaters properly | Tiger Wang | 2013-12-15 | 1 | -0/+7 |
| | | |||||
| * | Fixed the hopefully final wire self-powering bug | Tiger Wang | 2013-12-15 | 1 | -1/+13 |
| | | |||||
| * | Potentially fixed debug asserts | Tiger Wang | 2013-12-14 | 1 | -5/+5 |
| | | |||||
| * | Wires no longer power if a block cuts them off | Tiger Wang | 2013-12-14 | 1 | -23/+32 |
| | | | | | | | | Also reduced more unneeded code. | ||||
| * | Implemented note block playing and fixed wire | Tiger Wang | 2013-12-14 | 2 | -4/+50 |
| | | | | | | | | Game of Thrones music in Minecraft, here I come! | ||||
* | | moved simulor to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-11 | 2 | -287/+136 |
|\| | |||||
| * | Fixed compilating! | Tiger Wang | 2013-12-14 | 1 | -5/+5 |
| | | |||||
| * | Fixes to redstone wire and torches | Tiger Wang | 2013-12-14 | 2 | -20/+36 |
| | | | | | | | | | | | | + 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. | ||||
| * | Removed loads of unneeded code again | Tiger Wang | 2013-12-14 | 1 | -86/+60 |
| | | |||||
| * | Reduced loads of unneeded code | Tiger Wang | 2013-12-14 | 1 | -188/+44 |
| | | | | | | | | Merged wire powering detection code into a single function. | ||||
| * | Fixed pistons being viable middle block | Tiger Wang | 2013-12-11 | 1 | -0/+3 |
| | | | | | | | | Also an excuse to update submodules | ||||
| * | Provides a possible fix for repeater timings | Tiger Wang | 2013-12-10 | 1 | -1/+1 |
| | | | | | | | | Not completely reliable, but at least some types of clock work. | ||||
* | | more cmake | Tycho Bickerstaff | 2013-12-10 | 1 | -0/+7 |
|/ | |||||
* | Merge pull request #412 from mc-server/fixes | Mattes D | 2013-12-10 | 3 | -6/+90 |
|\ | | | | | Main feature: repeater delays! | ||||
| * | Readded initial line | Tiger Wang | 2013-12-10 | 1 | -0/+1 |
| | | |||||
| * | Fixed compile (alas, no more goto) | Tiger Wang | 2013-12-10 | 1 | -11/+14 |
| | | |||||
| * | Fixed Floody lava to stone fizzle | Tiger Wang | 2013-12-10 | 1 | -2/+16 |
| | | |||||
| * | Added repeater delays | Tiger Wang | 2013-12-10 | 2 | -1/+62 |
| | | | | | | | | They DO sometimes get stuck though :P | ||||
| * | Slight redstone wire performance improvement | Tiger Wang | 2013-12-10 | 1 | -1/+6 |
| | | |||||
| * | Changed more FastSetBlocks to SetBlocks | Tiger Wang | 2013-12-10 | 1 | -3/+3 |
| | | | | | | | | Fixes duplication bugs. | ||||
* | | Fix Unused Variable Warning at FluidSimulator.cpp line 169 and 176 | worktycho | 2013-12-09 | 1 | -4/+3 |
|/ | |||||
* | Changed some FastSetBlocks to SetBlock | Tiger Wang | 2013-12-07 | 1 | -3/+3 |
| | | | | Should fix some duplication glitches. | ||||
* | Fixed trapdoors not toggling | Tiger Wang | 2013-12-07 | 2 | -16/+102 |
| | | | | The redstone simulator kept on resetting them. | ||||
* | Re-implemented redstone duplicate checking | Tiger Wang | 2013-12-06 | 1 | -0/+29 |
| | |||||
* | Merged if statements. | Samuel Barney | 2013-12-05 | 1 | -7/+1 |
| | |||||
* | Finished Merge | Samuel Barney | 2013-12-05 | 1 | -2/+2 |
| | |||||
* | Made suggested changes | Samuel Barney | 2013-12-04 | 2 | -6/+11 |
| | |||||
* | Fire no longer goes out when on top of nether rack | Samuel Barney | 2013-12-02 | 1 | -1/+6 |
| | |||||
* | Fixed linux compile errors and formatting in RedstoneSimulator.cpp | madmaxoft | 2013-12-01 | 1 | -14/+26 |
| | |||||
* | Fixed pistons extending | Tiger Wang | 2013-11-30 | 1 | -0/+10 |
| | | | | They didn't when a source was in front, but now they do! Yay! | ||||
* | Removed redstone duplicate power checking | Tiger Wang | 2013-11-30 | 1 | -2/+0 |
| | | | | There was no need for it, and it introduced some bugs. | ||||
* | Improved piston direction checking | Tiger Wang | 2013-11-30 | 1 | -62/+8 |
| | | | | Now uses AddFaceDirection, as suggested by xoft. | ||||
* | Pistons no longer accept power through front face | Tiger Wang | 2013-11-30 | 2 | -3/+96 |
| | | | | This fixes #60. | ||||
* | Improved redstone speed and fixed a wire bug | Tiger Wang | 2013-11-30 | 1 | -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. | ||||
* | Implemented trapdoors, fixes #43 and #105 | Tiger Wang | 2013-11-29 | 2 | -0/+19 |
| | | | | Also updated redstone simulator to support it | ||||
* | Merged master into redstonefixes | Tiger Wang | 2013-11-27 | 2 | -201/+361 |
| | |||||
* | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 1 | -1/+1 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 2 | -918/+926 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 19 | -0/+3347 |