summaryrefslogtreecommitdiffstats
path: root/src/Simulator (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix fence gate sound (Redstone simulator).Howaner2014-06-171-4/+10
|
* Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-161-8/+30
|
* Fixed a repeater issueTiger Wang2014-06-142-17/+16
| | | | | * Repeaters now properly continuously update their powering * Minor cosmetic improvements
* Fixed two redstone bugsTiger Wang2014-06-121-0/+6
| | | | | * Fixed chunk border powering * Fixed quick place-replace powering
* Merge remote-tracking branch 'howaner/Redstone'madmaxoft2014-06-091-4/+10
|\
| * Add SetOpen() and IsOpen() to BlockDoor.h and fix door redstone bug.Howaner2014-05-291-4/+10
| |
* | Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-1/+1
| | | | | | | | Fixes #1039, fixes #851
* | Further improvements on redstone speedTiger Wang2014-06-072-67/+80
| | | | | | | | | | | | | | Based on suggestions of @worktycho * Repeaters now walk their data structure only when needed * Fixed a bug with cChunkData returning an incorrect value for whether a meta had changed
* | Further reduced redstone idle CPU consumptionTiger Wang2014-06-061-7/+27
| | | | | | | | | | | | * Repeaters and wires are no longer unnecessarily ticked * Fixed #1063, likely addressed #1062 * Fixed bugs regarding duplicate values
* | Redstone fixes and improvements [SEE DESC]Tiger Wang2014-06-051-60/+87
| | | | | | | | | | | | | | | | Haha, see desc. * Improved redstone speed through a marking dirty system. Only a select few devices are still continuously simulated * Fixed redstone crashing with recent piston changes
* | Merge pull request #1011 from SphinxC0re/SomeWarningFixesMattes D2014-06-041-2/+8
|\ \ | | | | | | Fixed some warnings
| * | Update IncrementalRedstoneSimulator.cppJulian Laubstein2014-06-041-8/+8
| | |
| * | Fixed warnings in IncrementalRedstoneSimulatorJulian Laubstein2014-05-191-1/+7
| | |
| * | Rolled some changes backJulian Laubstein2014-05-191-12/+2
| | |
| * | Fixed some warningsJulian Laubstein2014-05-191-2/+12
| |/
* | Merge remote-tracking branch 'origin/pistonfixes'Tiger Wang2014-06-021-16/+10
|\ \ | | | | | | | | | | | | Conflicts: src/Chunk.cpp
| * | Fixed piston power checkingTiger Wang2014-05-291-11/+6
| | |
| * | Hopefully fixed piston duplication issuesTiger Wang2014-05-251-5/+4
| |/ | | | | | | | | * Fixes #879 * Fixes #714
* | Merge branch 'master' into chunksparsing/structsTycho2014-05-105-445/+605
|\| | | | | | | | | Conflicts: src/Chunk.h
| * Fixed MSVC 64-bit build warnings.Mattes D2014-05-092-2/+2
| |
| * Fixed wires powering wires diagonally below themTiger Wang2014-05-071-5/+1
| |
| * Add clicks, exp subtraction, item check, ...Howaner2014-05-051-0/+4
| |
| * Fixed formattingTiger Wang2014-05-051-4/+5
| |
| * Fixed 027efe09ea3d3222c3cbf169643e57773c1614aeTiger Wang2014-05-041-3/+49
| |
| * Merge branch 'master' into redstoneimprovementsTiger Wang2014-05-045-15/+24
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp
| | * Fixed pressure plate oversightsTiger Wang2014-05-041-2/+8
| | | | | | | | | | | | | | | | | | | | | * Fixed stone pressure plates not checking for the correct distance for players * Fixed pressure plates in general not link powering the blocks beneath them
| | * Fixed vanilla fluid simulator.madmaxoft2014-05-031-4/+1
| | | | | | | | | | | | Fixes #919.
| * | Fixed lever and button powering directionTiger Wang2014-05-041-16/+8
| | |
| * | Redstone simulator now directly accesses cChunkTiger Wang2014-04-272-438/+556
| | | | | | | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes
* | | Merge branch 'master' into chunksparsing/structsTycho2014-05-034-14/+20
|\ \ \ | | |/ | |/| | | | | | | Conflicts: src/Chunk.cpp
| * | Fixed vanilla fluid simulator.madmaxoft2014-05-024-14/+20
| |/ | | | | | | Fixes #919.
* | Merge branch 'master' into chunksparsing/structsTycho2014-04-275-233/+412
|\| | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h
| * Cmake generated projects for IDEs include headers in project files.archshift2014-04-251-0/+1
| |
| * Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-182-198/+315
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp
| | * Removed unsupported C++11 features.madmaxoft2014-04-181-13/+19
| | |
| | * Compile fix?Tiger Wang2014-04-171-2/+2
| | |
| | * Implemented weighted pressure platesTiger Wang2014-04-172-29/+171
| | |
| | * Rewrote redstone powering to use power levelsTiger Wang2014-04-152-180/+149
| | |
| * | Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-182-2/+2
| |/
| * cRedstoneSimulator.cpp style improvementsTiger Wang2014-04-081-40/+41
| |
| * Uppercased Zwiseoldman952014-04-081-3/+3
| | | | | | Minor, no code changed.
| * Comments: Inverted Z axis.wiseoldman952014-04-081-9/+10
| | | | | | | | | | -Comments fix, No code has been changed. -Inverted the Z axis in the comments and changed all dependent comments accordingly. -Added NORTH/SOUTH/EAST/WEST in addition to LEFT/RIGHT/UP/DOWN.
| * Added comments regarding latching and orientationwiseoldman952014-04-081-9/+31
| | | | | | No real code was changed.
| * Fixed the thing properly.Alexander Harkness2014-04-081-8/+8
| |
| * Merge pull request #862 from mc-server/redstonefixAlexander Harkness2014-04-081-23/+3
| |\ | | | | | | Fixed #859
| | * Fixed #859Tiger Wang2014-04-071-23/+3
| | |
| * | Fixed IsOnwiseoldman952014-04-071-3/+2
| | |
| * | Removed stray IsLockedwiseoldman952014-04-071-2/+2
| | |
| * | Removed unneeded spacingswiseoldman952014-04-071-6/+3
| | |
| * | Slight cleanupwiseoldman952014-04-071-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 Harkness2014-04-071-34/+39
| | |
| * | Improved the speed a little more.Alexander Harkness2014-04-071-1/+1
| | |
| * | Fixed the redstone simulator.Alexander Harkness2014-04-071-49/+40
| | |
| * | Fix some of the comments in the PR tycho just did.Alexander Harkness2014-04-071-8/+6
| | |
| * | Added support for redstone latchingTycho2014-04-062-2/+65
| |/ | | | | | | fixes #856
* / Implemented Chunk Sparsing with segmentsTycho2014-04-261-4/+6
|/
* Merge pull request #838 from mc-server/lilypadsworktycho2014-03-301-0/+1
|\ | | | | Lilypads
| * Some fixes to lilypadsTiger Wang2014-03-281-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.madmaxoft2014-03-281-1/+1
| |
* | Change SpreadSource prefix to ssHowaner2014-03-271-1/+1
| |
* | Add SpreadSourceHowaner2014-03-271-1/+1
| |
* | Add HOOK_BLOCK_SPREADHowaner2014-03-271-3/+11
|/
* Merge branch 'master' into awesometntTiger Wang2014-03-184-10/+21
|\ | | | | | | | | Conflicts: src/ChunkMap.cpp
| * Fixed double to float conversions.madmaxoft2014-03-161-1/+1
| |
| * Unified Vector classesandrew2014-03-112-2/+1
| |
| * Merge pull request #779 from mc-server/tntburnexplodeAlexander Harkness2014-03-101-7/+19
| |\ | | | | | | TNT explodes when consumed by fire
| | * Fixed compileTiger Wang2014-03-101-1/+2
| | |
| | * Removed uneeded meta obtainTiger Wang2014-03-091-3/+1
| | |
| | * TNT explodes when consumed by fireTiger Wang2014-03-091-6/+19
| | | | | | | | | | | | Fixed FS#406
* | | Merge remote-tracking branch 'origin/master' into awesometntTiger Wang2014-03-101-1/+1
|\| | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp
| * | Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-091-1/+1
| |\ \ | | | | | | | | Add TNT load/save
| | * | Merge branch 'master' into BlockEntitysHowaner2014-03-084-10/+291
| | |\|
| | * | Change TNT Fuse to ticksHowaner2014-03-081-1/+1
| | | |
* | | | Merge branch 'master' into awesometntTiger Wang2014-03-106-16/+295
|\| | |
| * | | Fixed issues with int vs size_t and a few other warningsTycho2014-03-081-1/+1
| | |/ | |/|
| * | Added some commentsandrew2014-03-072-1/+6
| | |
| * | Fixed water/lava interactionandrew2014-03-073-4/+69
| | |
| * | Merge remote-tracking branch 'xdot/master'madmaxoft2014-03-064-8/+219
| |\ \ | | |/ | |/|
| | * Implemented vanilla-like fluid simulatorandrew2014-03-054-8/+219
| | |
| * | Merge pull request #746 from Howaner/SlabsMattes D2014-03-031-5/+3
| |\ \ | | |/ | |/| Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
| | * Add Trapdoor Functions to cWorld and fix Trapdoor Redstone BugsHowaner2014-03-021-5/+3
| | |
* | | Added extra awesomeness to TNTTiger Wang2014-03-051-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/masterMattes D2014-03-023-4/+4
|\ \ | |/ |/| Refactored global block property arrays
| * g_BlockXXX => cBlockInfo::XXXandrew2014-03-013-4/+4
| |
* | Fix Double Slabs, fix Slab Meta and add more things to burnableHowaner2014-02-281-0/+13
|/
* Removed problematic utf8.madmaxoft2014-02-201-2/+2
|
* Bad UTF-8 o.OHowaner2014-02-201-2/+2
|
* Remove typeinfo import in IncrementalRedstoneSimulatorHowaner2014-02-201-2/+0
|
* Add Pressure Plate SoundHowaner2014-02-201-0/+9
|
* Add Light weighted pressure platesHowaner2014-02-202-10/+20
|
* Add Hay Bale to BurnableHowaner2014-02-201-0/+1
|
* Fixed a glaring bug with chunk cross-simulatingTiger Wang2014-02-161-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 switchTiger Wang2014-02-151-0/+1
|
* A fix and an improvementTiger Wang2014-02-152-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 redstoneTiger Wang2014-02-152-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 SimulatorHowaner2014-02-151-1/+23
|
* Add Fence Gate to Redstone SimulatorHowaner2014-02-152-0/+31
|
* Improved pressure platesTiger Wang2014-02-122-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).STRWarrior2014-02-077-1809/+1809
|
* Fixed some end of linesSTRWarrior2014-02-072-2/+2
|
* Implemented an easy way of adding new redstone simulators.STRWarrior2014-02-074-3/+79
| | | | Also added a "noop" redstone simulator that does the same as the fluid version.
* Fixed most of the reordering warningsTycho2014-02-051-3/+3
|
* Improved Type safety of eBlockFaceTycho2014-02-041-2/+3
| | | | May Fix #640
* Removed unused lookupsTycho2014-02-031-2/+0
|
* Merge pull request #602 from mc-server/improvementsandfixesMattes D2014-02-032-13/+14
|\ | | | | Redstone crash fix and current console line replace function
| * Split cCoord template into one and two data typesTiger Wang2014-02-011-2/+2
| |
| * Fixed redstone simulator crash found in #570Tiger Wang2014-01-292-13/+14
| |
* | Changed Signiture of OnUpdateTycho2014-02-021-1/+7
| |
* | Changed pointers to referencesTycho2014-02-011-2/+2
| |
* | Changed signitures of Several BLockHandler MethodsTycho2014-02-011-2/+4
|/ | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check
* Basic command block implementationandrew2014-01-182-1/+30
|
* Fixed wire, rail, and pressure plate unpoweringTiger Wang2014-01-131-3/+4
|
* Fixed rails poweringTiger Wang2014-01-111-0/+2
|
* Did some stuff with the vectorsTiger Wang2014-01-111-32/+17
|
* Fixed a door bug and reduced codeTiger Wang2014-01-111-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 #453Tiger Wang2014-01-101-38/+8
|
* Major refactoring of redstoneTiger Wang2014-01-102-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.cppTycho Bickerstaff2013-12-311-2/+8
|
* converted commneted paramater names to the unused macroTycho Bickerstaff2013-12-224-5/+11
|
* Merge branch 'master' of github.com:mc-server/MCServerTycho Bickerstaff2013-12-222-20/+161
|\
| * Merge pull request #461 from mc-server/repeatersMattes D2013-12-262-20/+161
| |\ | | | | | | Repeaters, pressure plates, and others
| | * Moved increment operator to back of variablesTiger Wang2013-12-261-9/+9
| | |
| | * Implemented stone and wooden pressure platesTiger Wang2013-12-242-3/+105
| | |
| | * Provides an enhancement to daylight sensorsTiger Wang2013-12-231-2/+27
| | |
| | * Daylight sensor sensing enhancementTiger Wang2013-12-231-9/+11
| | |
| | * A fix for daylight sensorsTiger Wang2013-12-221-2/+3
| | |
| | * Daylight sensorsTiger Wang2013-12-221-2/+1
| | |
| | * Fixed them again, confound itTiger Wang2013-12-221-9/+21
| | |
* | | Piston is now warnings cleanTycho Bickerstaff2013-12-213-4/+4
| | |
* | | ChunkSender is now warnings cleanTycho Bickerstaff2013-12-211-1/+2
|/ /
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-212-12/+38
|\|
| * Fixed repeaters delay, maybeTiger Wang2013-12-202-12/+38
| | | | | | | | | | Also added basic daylight sensors, though because GetBlockSkylight always is 15, it doesn't work.
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-203-6/+6
|\|
| * Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-203-6/+6
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-191-11/+41
|\|
| * Fixed repeaters not updating powerTiger Wang2013-12-191-11/+41
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-182-116/+196
|\|
| * Fixed wire powering blocks beneathTiger Wang2013-12-181-1/+1
| |
| * Fixed bad repeater power queuing in corner caseTiger Wang2013-12-182-83/+76
| | | | | | | | | | Repeaters remain queued to power even if their original source has since unpowered. Also functionised and cleaned up code.
| * Implemented xoft's suggestionsTiger Wang2013-12-151-3/+16
| |
| * Fixed wire repeater checkingTiger Wang2013-12-151-1/+1
| |
| * Wires now power repeaters properlyTiger Wang2013-12-151-0/+7
| |
| * Fixed the hopefully final wire self-powering bugTiger Wang2013-12-151-1/+13
| |
| * Potentially fixed debug assertsTiger Wang2013-12-141-5/+5
| |
| * Wires no longer power if a block cuts them offTiger Wang2013-12-141-23/+32
| | | | | | | | Also reduced more unneeded code.
| * Implemented note block playing and fixed wireTiger Wang2013-12-142-4/+50
| | | | | | | | Game of Thrones music in Minecraft, here I come!
* | moved simulor to globsTycho Bickerstaff2013-12-111-1/+5
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-112-287/+136
|\|
| * Fixed compilating!Tiger Wang2013-12-141-5/+5
| |
| * Fixes to redstone wire and torchesTiger Wang2013-12-142-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 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.
| * Fixed pistons being viable middle blockTiger Wang2013-12-111-0/+3
| | | | | | | | Also an excuse to update submodules
| * Provides a possible fix for repeater timingsTiger Wang2013-12-101-1/+1
| | | | | | | | Not completely reliable, but at least some types of clock work.
* | more cmakeTycho Bickerstaff2013-12-101-0/+7
|/
* Merge pull request #412 from mc-server/fixesMattes D2013-12-103-6/+90
|\ | | | | 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.
* | Fix Unused Variable Warning at FluidSimulator.cpp line 169 and 176worktycho2013-12-091-4/+3
|/
* Changed some FastSetBlocks to SetBlockTiger Wang2013-12-071-3/+3
| | | | Should fix some duplication glitches.
* Fixed trapdoors not togglingTiger Wang2013-12-072-16/+102
| | | | The redstone simulator kept on resetting them.
* Re-implemented redstone duplicate checkingTiger Wang2013-12-061-0/+29
|
* Merged if statements.Samuel Barney2013-12-051-7/+1
|
* Finished MergeSamuel Barney2013-12-051-2/+2
|
* Made suggested changesSamuel Barney2013-12-042-6/+11
|
* Fire no longer goes out when on top of nether rackSamuel Barney2013-12-021-1/+6
|
* Fixed linux compile errors and formatting in RedstoneSimulator.cppmadmaxoft2013-12-011-14/+26
|
* 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.
* 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.
* Implemented trapdoors, fixes #43 and #105Tiger Wang2013-11-292-0/+19
| | | | Also updated redstone simulator to support it
* Merged master into redstonefixesTiger Wang2013-11-272-201/+361
|
* Fixed the remaining derpsAlexander Harkness2013-11-271-1/+1
|
* Further attempts to fix compileTiger Wang2013-11-251-1/+1
|
* Attempt to fix compilationTiger Wang2013-11-241-1/+1
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-242-918/+926
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-2419-0/+3347
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 11:53:57 +0100