Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed redstone issue | scribblemaniac | 2015-07-17 | 1 | -2/+4 |
| | | | | | Fixed issue where glowstone blocks would block power transmission in some situations. | ||||
* | Improved maps | Tiger Wang | 2015-07-14 | 3 | -10/+10 |
| | |||||
* | Added moar comments | Tiger Wang | 2015-06-07 | 2 | -13/+13 |
| | |||||
* | Vector hasher is now a separate class | Tiger Wang | 2015-06-07 | 1 | -5/+7 |
| | |||||
* | Use emplace to construct structures | Tiger Wang | 2015-06-06 | 2 | -54/+61 |
| | |||||
* | Improved link unpowering speed | Tiger Wang | 2015-06-06 | 1 | -48/+41 |
| | | | | Also fixed compile errors | ||||
* | Changed appropriate containers to unordered_map | Tiger Wang | 2015-06-06 | 2 | -158/+85 |
| | | | | | | Thanks to @worktycho for guidance! * Potential speed improvements | ||||
* | Improved link power behaviour | Tiger Wang | 2015-06-06 | 2 | -163/+119 |
| | |||||
* | Improved wires and repeaters | Tiger Wang | 2015-06-06 | 2 | -73/+152 |
| | | | | | * Fixed repeater cross-chunk power detection + Re-implemented horizontal wire cut-off checking | ||||
* | Fixed wire consuming much resources | Tiger Wang | 2015-06-06 | 1 | -7/+17 |
| | |||||
* | Redstone wire and trapdoor fixes | Tiger Wang | 2015-06-06 | 2 | -310/+309 |
| | | | | | | * Fixes #1887 * Fixes #1763 * Fixes #1083 | ||||
* | Provides improvements to redstone wire | Tiger Wang | 2015-06-06 | 2 | -94/+70 |
| | | | | Intermediary commit that fixes #1763. | ||||
* | Comparators | Tiger Wang | 2015-06-06 | 2 | -78/+180 |
| | |||||
* | Fix comments | tycho | 2015-05-28 | 4 | -9/+16 |
| | |||||
* | Made -Weverything an error. | tycho | 2015-05-24 | 5 | -10/+29 |
| | |||||
* | Make -Werror disabling file only | tycho | 2015-05-19 | 2 | -1/+8 |
| | | | | Ad fix a load of warnings | ||||
* | More style checking. | Mattes D | 2015-05-09 | 2 | -6/+6 |
| | | | | Spaces around some operators are checked. | ||||
* | Correct world height validations. | Tommy Santerre | 2015-03-20 | 2 | -3/+3 |
| | | | | | Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1). Allow generation of world of flat height = 255 | ||||
* | Removed wrong else clause, which caused that the following if-Statement got only executed in rare cases. This has blocked the creation of new Fluid-Sources. Bugfix #1783 | bibo38 | 2015-03-19 | 1 | -1/+2 |
| | |||||
* | Fixed type conversion warnings. | Mattes D | 2015-01-18 | 1 | -1/+1 |
| | |||||
* | Initial convertion of a_Dt to std::chrono | Tycho | 2015-01-11 | 12 | -13/+13 |
| | | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay | ||||
* | Fixed basic style. | Mattes D | 2014-12-25 | 2 | -21/+69 |
| | |||||
* | Fix repeater unpowering | Tiger Wang | 2014-12-18 | 1 | -2/+4 |
| | |||||
* | Merge pull request #1674 from gushromp/master | Mattes D | 2014-12-17 | 1 | -8/+7 |
|\ | | | | | Fix for water spreading on bottom of the world | ||||
| * | Removed unneeded newlines | Ivan Đorđević | 2014-12-17 | 1 | -6/+0 |
| | | |||||
| * | Merge branch 'master' of https://github.com/gushromp/MCServer | gushromp | 2014-12-16 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | Conflicts: src/Simulator/FloodyFluidSimulator.cpp | ||||
| | * | Fixed water from spreading on bottom of world | gushromp | 2014-12-16 | 1 | -5/+8 |
| | | | |||||
| * | | Fixed water from spreading on bottom of world | gushromp | 2014-12-16 | 1 | -7/+11 |
| |/ | |||||
* | | NULL -> nullptr | Tiger Wang | 2014-12-17 | 2 | -14/+18 |
| | | |||||
* | | Merge branch 'master' into redstone | Tiger Wang | 2014-12-13 | 1 | -1/+5 |
|\| | |||||
| * | BasicStyle: Added missing braces to control statements. | Mattes D | 2014-12-05 | 1 | -0/+2 |
| | | |||||
| * | Fixed reported parentheses around comparisons. | Mattes D | 2014-12-05 | 1 | -1/+3 |
| | | |||||
* | | Improved redstone simulator | Tiger Wang | 2014-10-29 | 2 | -818/+808 |
| | | | | | | | | | | | | * Fixed style inconsistencies * Used more C++11 features * Improved speed perhaps | ||||
* | | Cleaned up simulators | Tiger Wang | 2014-10-25 | 13 | -2671/+2634 |
|/ | |||||
* | Merge pull request #1565 from mc-server/MergedIniFile | Mattes D | 2014-10-24 | 1 | -1/+1 |
|\ | | | | | Merged ini file | ||||
| * | Merged IniFile into main MCS sources. | Mattes D | 2014-10-23 | 1 | -1/+1 |
| | | |||||
* | | Fixed a crash in redstone simulator. | Mattes D | 2014-10-23 | 1 | -1/+0 |
|/ | |||||
* | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 8 | -11/+11 |
| | |||||
* | Functions in cPluginManager get references instead of pointers. | Mattes D | 2014-10-15 | 1 | -2/+2 |
| | |||||
* | Fixed iron trapdoors | Howaner | 2014-09-30 | 1 | -0/+1 |
| | |||||
* | Use factory method to construct redstone simulator data | Tycho | 2014-09-28 | 3 | -0/+12 |
| | |||||
* | Fixed another redstone crash. | madmaxoft | 2014-09-27 | 1 | -1/+6 |
| | |||||
* | Wrapped clang-specific pragma into an #ifdef block. | madmaxoft | 2014-09-27 | 1 | -1/+6 |
| | | | | MSVC was complaining about an unknown pragma. | ||||
* | Update IncrementalRedstoneSimulator.inc | worktycho | 2014-09-27 | 1 | -1/+1 |
| | |||||
* | Update IncrementalRedstoneSimulator.inc | worktycho | 2014-09-27 | 1 | -1/+1 |
| | |||||
* | Correct method name. | worktycho | 2014-09-27 | 1 | -1/+1 |
| | |||||
* | Set chunk data | worktycho | 2014-09-27 | 1 | -0/+5 |
| | |||||
* | Merge pull request #1415 from Masy98/blocks | Mattes D | 2014-09-26 | 2 | -9/+57 |
|\ | | | | | Added 1.8 Blocks and Items | ||||
| * | Re-added 1.8 blocks to the redstone simulator | Masy98 | 2014-09-26 | 1 | -9/+46 |
| | | |||||
| * | Merge branch 'master' into blocks | Masy98 | 2014-09-26 | 16 | -2617/+2649 |
| |\ | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHandler.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | Added blocks to the fire simulator | Masy98 | 2014-09-11 | 1 | -0/+11 |
| | | | |||||
| * | | Added iron trapdoor, fence gates and doors to the redstone simulator | Masy98 | 2014-09-10 | 1 | -0/+11 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tycho | 2014-09-26 | 1 | -1/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fixed issue with casting | tycho | 2014-09-26 | 1 | -1/+3 |
| | | | |||||
* | | | Removed more unessicary includes | Tycho | 2014-09-26 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -11/+23 |
|\ \ | | | | | | | | | | | | | Conflicts: src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | Redstone: Fixed a crash with repeaters on a chunk border. | madmaxoft | 2014-09-25 | 1 | -13/+22 |
| |/ | |||||
* | | Added first test to show the object can be created | Tycho | 2014-09-17 | 6 | -30/+40 |
| | | |||||
* | | IncrementalRedstoneSimulator now has no dependencies on cChunk | Tycho | 2014-09-16 | 4 | -364/+382 |
| | | |||||
* | | Don't include IncrementalRedsonteSimulator.inc when in SELF_TEST mode | Tycho | 2014-09-11 | 1 | -5/+0 |
| | | |||||
* | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the server | Tycho | 2014-09-11 | 15 | -2318/+2324 |
|/ | | | | THis wil hopefully allow for unit testing | ||||
* | VanillaFluidSimulator: Fixed an invalid Y-coord query. | Mattes D | 2014-08-29 | 1 | -1/+1 |
| | | | | This was causing a spam of console messages, along with possible server crash, when liquids passed below the world: http://forum.mc-server.org/showthread.php?tid=1508&pid=15632#pid15632 | ||||
* | Removed dependecy of redstone simulator on NoteBlock | Tycho | 2014-08-05 | 1 | -11/+6 |
| | |||||
* | Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity Directly | Tycho | 2014-08-05 | 1 | -5/+4 |
| | |||||
* | CheckBasicStyle: multi-level indent change. | madmaxoft | 2014-08-04 | 1 | -3/+3 |
| | |||||
* | Added missing HOOK_BLOCK_SPREAD call. | Howaner | 2014-08-01 | 1 | -6/+14 |
| | |||||
* | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 1 | -1/+1 |
| | |||||
* | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 2 | -4/+4 |
| | |||||
* | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 2 | -4/+4 |
| | |||||
* | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 2 | -6/+6 |
| | |||||
* | Subdirs: Only add_library if not using MSVC | archshift | 2014-07-19 | 1 | -1/+3 |
| | |||||
* | Simulator/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+28 |
| | |||||
* | Fixed spaces before commas. | madmaxoft | 2014-07-18 | 1 | -2/+2 |
| | |||||
* | Fixed tabs used for alignment. | madmaxoft | 2014-07-17 | 4 | -4/+4 |
| | |||||
* | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 1 | -4/+4 |
| | |||||
* | Basic style fixes. | madmaxoft | 2014-07-17 | 10 | -21/+21 |
| | |||||
* | Normalized comments. | madmaxoft | 2014-07-17 | 6 | -84/+84 |
| | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign. | ||||
* | Fixed another redstone simulator crash | Tiger Wang | 2014-07-16 | 1 | -0/+7 |
| | |||||
* | Fixed redstone simulator crash | Tiger Wang | 2014-07-15 | 2 | -8/+31 |
| | | | | | * Fixes #1176 * Fixed #1186 | ||||
* | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 3 | -10/+10 |
| | |||||
* | Suggestions and bug fix | Tiger Wang | 2014-07-12 | 1 | -1/+1 |
| | | | | | | * Fixed hoppers pushing/pulling to/from (trapped)chests that do not form a double-chest with the chest type directly connected to said hopper; thank you, @madmaxoft | ||||
* | Suggestions | Tiger Wang | 2014-07-11 | 1 | -0/+3 |
| | |||||
* | Suggestions | Tiger Wang | 2014-07-11 | 1 | -1/+4 |
| | |||||
* | Improved LinkedPowering speed | Tiger Wang | 2014-07-11 | 1 | -15/+15 |
| | | | | * Additionally fixed wires powering other wires through blocks | ||||
* | Fixed compilation and pressure plates | Tiger Wang | 2014-07-07 | 1 | -8/+4 |
| | |||||
* | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 2 | -83/+150 |
| | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes | ||||
* | Fixed c1deda5d8f01811efa5094e9375166acb69d50ed | Tiger Wang | 2014-07-04 | 1 | -2/+2 |
| | | | | I keep on breaking stuff :P | ||||
* | Implemented tripwire(s) (hooks) | Tiger Wang | 2014-06-28 | 2 | -15/+156 |
| | | | | * Fixes #944 | ||||
* | Fixed bad water/redstone simulator communication | Tiger Wang | 2014-06-28 | 1 | -32/+22 |
| | | | | * Fixes #713 | ||||
* | Merge pull request #1105 from Howaner/Blocks | Mattes D | 2014-06-22 | 1 | -4/+10 |
|\ | | | | | Added door and fence gate sounds. | ||||
| * | Changed 0xFFFFFFFB to ~0x04 | Howaner | 2014-06-22 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into Blocks | Howaner | 2014-06-17 | 1 | -2/+1 |
| |\ | |||||
| * | | Fix fence gate sound (Redstone simulator). | Howaner | 2014-06-17 | 1 | -4/+10 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-06-22 | 1 | -2/+4 |
|\ \ \ | |||||
| * | | | Fixed missing break | worktycho | 2014-06-22 | 1 | -0/+1 |
| | | | | | | | | | | | | Fixes CID 68409 | ||||
| * | | | Fixed invalid iterator | worktycho | 2014-06-22 | 1 | -2/+3 |
| | | | | | | | | | | | | Fixes CID 60408 | ||||
* | | | | Fixed another daylight sensor bug | Tiger Wang | 2014-06-22 | 1 | -20/+23 |
|/ / / | | | | | | | | | | Additionally fixed unpowering across chunks. | ||||
* | | | Nullify deleted pointers. | archshift | 2014-06-19 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #1096 from mc-server/redstonerefactor | Alexander Harkness | 2014-06-18 | 2 | -138/+66 |
|\ \ \ | |_|/ |/| | | Moved delayed repeaters to be handled in a seperate pass | ||||
| * | | FIxed second weird enum | Tycho | 2014-06-16 | 1 | -20/+1 |
| | | | |||||
| * | | Refactored reversing logic into seperate function | Tycho | 2014-06-16 | 1 | -14/+3 |
| | | | |||||
| * | | Fixed tigers weird enums | Tycho | 2014-06-16 | 1 | -14/+6 |
| | | | |||||
| * | | Merge branch 'master' into redstonerefactor | Tycho | 2014-06-16 | 1 | -8/+29 |
| |\| | | | | | | | | | | | | | Conflicts: src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | Moved repeater handling to seperate pass | Tycho | 2014-06-16 | 2 | -97/+64 |
| | | | |||||
* | | | Fix fence gate redstone simulator. | Howaner | 2014-06-17 | 1 | -2/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 1 | -8/+30 |
|/ | |||||
* | Fixed a repeater issue | Tiger Wang | 2014-06-14 | 2 | -17/+16 |
| | | | | | * Repeaters now properly continuously update their powering * Minor cosmetic improvements | ||||
* | Fixed two redstone bugs | Tiger Wang | 2014-06-12 | 1 | -0/+6 |
| | | | | | * Fixed chunk border powering * Fixed quick place-replace powering | ||||
* | Merge remote-tracking branch 'howaner/Redstone' | madmaxoft | 2014-06-09 | 1 | -4/+10 |
|\ | |||||
| * | Add SetOpen() and IsOpen() to BlockDoor.h and fix door redstone bug. | Howaner | 2014-05-29 | 1 | -4/+10 |
| | | |||||
* | | Fixed deadlock when moving players to other worlds. | Mattes D | 2014-06-08 | 1 | -1/+1 |
| | | | | | | | | Fixes #1039, fixes #851 | ||||
* | | Further improvements on redstone speed | Tiger Wang | 2014-06-07 | 2 | -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 consumption | Tiger Wang | 2014-06-06 | 1 | -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 Wang | 2014-06-05 | 1 | -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/SomeWarningFixes | Mattes D | 2014-06-04 | 1 | -2/+8 |
|\ \ | | | | | | | Fixed some warnings | ||||
| * | | Update IncrementalRedstoneSimulator.cpp | Julian Laubstein | 2014-06-04 | 1 | -8/+8 |
| | | | |||||
| * | | Fixed warnings in IncrementalRedstoneSimulator | Julian Laubstein | 2014-05-19 | 1 | -1/+7 |
| | | | |||||
| * | | Rolled some changes back | Julian Laubstein | 2014-05-19 | 1 | -12/+2 |
| | | | |||||
| * | | Fixed some warnings | Julian Laubstein | 2014-05-19 | 1 | -2/+12 |
| |/ | |||||
* | | Merge remote-tracking branch 'origin/pistonfixes' | Tiger Wang | 2014-06-02 | 1 | -16/+10 |
|\ \ | | | | | | | | | | | | | Conflicts: src/Chunk.cpp | ||||
| * | | Fixed piston power checking | Tiger Wang | 2014-05-29 | 1 | -11/+6 |
| | | | |||||
| * | | Hopefully fixed piston duplication issues | Tiger Wang | 2014-05-25 | 1 | -5/+4 |
| |/ | | | | | | | | | * Fixes #879 * Fixes #714 | ||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 5 | -445/+605 |
|\| | | | | | | | | | Conflicts: src/Chunk.h | ||||
| * | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 2 | -2/+2 |
| | | |||||
| * | Fixed wires powering wires diagonally below them | Tiger Wang | 2014-05-07 | 1 | -5/+1 |
| | | |||||
| * | Add clicks, exp subtraction, item check, ... | Howaner | 2014-05-05 | 1 | -0/+4 |
| | | |||||
| * | Fixed formatting | Tiger Wang | 2014-05-05 | 1 | -4/+5 |
| | | |||||
| * | Fixed 027efe09ea3d3222c3cbf169643e57773c1614ae | Tiger Wang | 2014-05-04 | 1 | -3/+49 |
| | | |||||
| * | Merge branch 'master' into redstoneimprovements | Tiger Wang | 2014-05-04 | 5 | -15/+24 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| | * | Fixed pressure plate oversights | Tiger Wang | 2014-05-04 | 1 | -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. | madmaxoft | 2014-05-03 | 1 | -4/+1 |
| | | | | | | | | | | | | Fixes #919. | ||||
| * | | Fixed lever and button powering direction | Tiger Wang | 2014-05-04 | 1 | -16/+8 |
| | | | |||||
| * | | Redstone simulator now directly accesses cChunk | Tiger Wang | 2014-04-27 | 2 | -438/+556 |
| | | | | | | | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes | ||||
* | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-03 | 4 | -14/+20 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: src/Chunk.cpp | ||||
| * | | Fixed vanilla fluid simulator. | madmaxoft | 2014-05-02 | 4 | -14/+20 |
| |/ | | | | | | | Fixes #919. | ||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-04-27 | 5 | -233/+412 |
|\| | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h | ||||
| * | Cmake generated projects for IDEs include headers in project files. | archshift | 2014-04-25 | 1 | -0/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 2 | -198/+315 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp | ||||
| | * | Removed unsupported C++11 features. | madmaxoft | 2014-04-18 | 1 | -13/+19 |
| | | | |||||
| | * | Compile fix? | Tiger Wang | 2014-04-17 | 1 | -2/+2 |
| | | | |||||
| | * | Implemented weighted pressure plates | Tiger Wang | 2014-04-17 | 2 | -29/+171 |
| | | | |||||
| | * | Rewrote redstone powering to use power levels | Tiger Wang | 2014-04-15 | 2 | -180/+149 |
| | | | |||||
| * | | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 2 | -2/+2 |
| |/ | |||||
| * | cRedstoneSimulator.cpp style improvements | Tiger Wang | 2014-04-08 | 1 | -40/+41 |
| | | |||||
| * | Uppercased Z | wiseoldman95 | 2014-04-08 | 1 | -3/+3 |
| | | | | | | Minor, no code changed. | ||||
| * | Comments: Inverted Z axis. | wiseoldman95 | 2014-04-08 | 1 | -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 orientation | wiseoldman95 | 2014-04-08 | 1 | -9/+31 |
| | | | | | | No real code was changed. | ||||
| * | Fixed the thing properly. | Alexander Harkness | 2014-04-08 | 1 | -8/+8 |
| | | |||||
| * | Merge pull request #862 from mc-server/redstonefix | Alexander Harkness | 2014-04-08 | 1 | -23/+3 |
| |\ | | | | | | | Fixed #859 | ||||
| | * | Fixed #859 | Tiger Wang | 2014-04-07 | 1 | -23/+3 |
| | | | |||||
| * | | 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 | ||||
* / | Implemented Chunk Sparsing with segments | Tycho | 2014-04-26 | 1 | -4/+6 |
|/ | |||||
* | 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 |