summaryrefslogtreecommitdiffstats
path: root/src/Simulator (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix SetBlockMeta call in observer handler (#4728)peterbell102020-05-081-2/+2
|
* Buttons can now be triggered by arrows. (#4670)DrButcher2020-05-031-3/+3
| | | * Buttons can now be triggered by arrows.
* Update src/Simulator/IncrementalRedstoneSimulator/RedstoneWireHandler.hmBornand2020-05-031-8/+1
| | | Co-authored-by: peterbell10 <peterbell10@live.co.uk>
* Update src/Simulator/IncrementalRedstoneSimulator/RedstoneWireHandler.hmBornand2020-05-031-8/+1
| | | Co-authored-by: peterbell10 <peterbell10@live.co.uk>
* Made some style update and add commentsMarc_Bornand2020-05-031-4/+9
|
* Fix the connexion to the side of the repeaterMarc_Bornand2020-05-031-3/+25
|
* Vector3 in Handlers (#4680)Mattes D2020-04-211-1/+13
| | | Refactored all cBlockHandler and cItemHandler descendants to use Vector3.
* Re-implement repeater lockingTiger Wang2020-04-181-5/+85
|
* Fixing washing away of redstone mechanisms (#4665)DrButcher2020-04-171-0/+1
|
* ಠ_ಠ (#4660)Tiger Wang2020-04-164-0/+112
| | | + Provisional handling for observers
* Using Super.Mattes D2020-04-1632-68/+123
|
* Pressure plate sounds and delay (#4643)DrButcher2020-04-141-7/+141
| | | | + Added sounds on depress and release + Added correct delay times
* Falling blocks can now be spawned at any position. (#4620)Mattes D2020-04-091-6/+1
| | | | | | | * Falling blocks can now be spawned at any position. * Added a /cake command to Debuggers that throws a cake in a nice slow arc. * Fixed regular falling blocks.
* Filter blocks to add to redstone sim's wake queue (#4621)peterbell102020-04-052-6/+62
|
* Add potatoes to washed away list alsoAlexander Harkness2020-04-051-1/+2
|
* FluidSimulator: Carrots should be also washable (#4619)metiu072020-04-051-0/+1
|
* Pulled the BlockID and BlockInfo headers from Globals.h. (#4591)Mattes D2020-04-036-1/+7
| | | | | | | | | The BlockID.h file was removed from Globals.h and renamed to BlockType.h (main change) The BlockInfo.h file was removed from Globals.h (main change) The ENUM_BLOCK_ID and ENUM_ITEM_ID enum names were replaced with ENUM_BLOCK_TYPE and ENUM_ITEM_TYPE (cosmetics) The various enums, such as eDimension, eDamageType and eExplosionSource were moved from BlockType.h to Defines.h, together with the helper functions for converting between them and strings (StringToDimension et al.) (minor) Many inline functions were moved from headers to their respective cpp files, so that BlockType.h could be included only into the cpp file, rather than the header. That broke our tests a bit, since they pick bits and pieces out of the main code and provide stubs for the rest; they had to be re-stubbed and re-verified. eMonsterType values are no longer tied to E_ITEM_SPAWN_EGG_META_* values
* Lock hopper when powered by redstone (#4347)Bond-0092020-03-273-0/+65
| | | | | | | | | * Lock hopper when powered by redstone * Add to manual bindings * Add hopper API documentation Co-authored-by: Mat <mail@mathias.is>
* TNT position fixes (#4519)Mat2020-03-222-3/+2
| | | | | | | | | | | | | | | | | | | * TNT position fixes * Don't add offset to explosion spawn coords * Don't make other entities push TNT * Correct initial TNT speed * Fix typo * Improvements * Revert unwanted change * Style fixes * Update format
* Moved growing from cWorld / cChunk to cBlockHandler descendants.Mattes D2019-10-284-97/+80
|
* Refactored block-to-pickup conversion. (#4417)Mattes D2019-10-164-34/+23
|
* Fix building with clang 8.0 (#4346)Bond-0092019-08-112-2/+2
|
* Add a formatting function for Vector3 (#4282)peterbell102018-09-243-41/+36
| | | | | | | | | | * Vector3: Add custom fmt compatible formatter. * cLuaState: Add fmt version of ApiParamError * Use vector formatting in manual bindings * Always log vectors with FLOG
* Force all headers other than "Globals.h" to be included with relative paths (#4269)peterbell102018-08-2917-22/+16
| | | | | | | Closes #4236 CMake now creates a header file in the build directory under the path "include/Globals.h" which just includes "src/Globals.h" with an absolute path. Then instead of adding "src/" to the include directories, it adds "include/". #include "Globals.h" still works by including the build generated file and any other src-relative path will not work.
* Add new flow direction calculating algorithm (#4160)bionext032018-07-272-75/+36
|
* cWorld: Manually bind deprecated broadcast functions (#4265)peterbell102018-07-272-2/+2
| | | Ref: https://github.com/cuberite/cuberite/pull/4264#discussion_r204769193
* CheckBasicStyle: Check number of empty lines between functions (#4267)peterbell102018-07-263-2/+1
| | | | Add check for number of empty lines between functions and fix the corresponding failures
* At long last... Piston animations!Tiger Wang2018-07-252-27/+12
| | | | | * Fixes #3198 * Fixes #57 (again lol)
* Broadcast refactor (#4264)peterbell102018-07-242-8/+6
| | | | | | | | | | | | | | | | | | | | | | | * Move Broadcast functions from cChunkMap to cBroadcaster - Remove cBroadcastInterface in favour of cBroadcaster. - cChunk: Remove broadcast functions. * resurect broadcast interface * Absorb cBroadcaster into cWorld. Removes the need for forwarding the function calls. * Improve const-correctness * Use Int8 instead of char + Comment `ForClients` functions * Improve comments * Broadcaster: Rename ForClients functions
* Add the fmt library (#4065)peterbell102018-01-034-26/+29
| | | | | | | * Replaces AppendVPrintf with fmt::sprintf * fmt::ArgList now used as a type safe alternative to varargs. * Removed SIZE_T_FMT compatibility macros. fmt::sprintf is fully portable and supports %zu. * Adds FLOG functions to log with fmt's native formatting style.
* Concrete mixing (#4096)Zach DeCook2018-01-031-0/+5
| | | | | | | | | Adds a block handler for concrete powder and implements hardening to concrete. Concrete powder turns into concrete when: * It is next to water when it receives a block update * It falls onto a water block (even with Physics SandInstantFall=1)
* improve rain simulation (#4017)Alexander Harkness2017-12-262-23/+45
| | | | | | | | | | | * Uses vanilla logic to decide which blocks rain falls through. * Rain falls infinitely above the world, and stops at y=0. * Entities will now be extinguished if they are under rain-blocking blocks, and fire will now be extinguished by rain similarly. * Create IsWeatherWetAtXYZ to identify wetness at a particular location. * Use new code for enderman rain detection. * Fixes issue #916 * Disable warnings for global constructors in the fire simulator.
* cPressurePlateHandler: Fix uninitialised variables. (#4047)peterbell102017-09-251-2/+2
|
* Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959)Lane Kolbly2017-09-193-10/+8
| | | | | | | | | | | | | | | | | | * Made BroadcastSoundEffect take vector parameters. * Added docs for new vectored methods * Removed old code * Fixed lua warnings * Made old BroadcastSoundEffect not an override. * m_Block to m_BlockPos, used Vector3d constructor where prettier. * a_Block to a_BlockPos * Changed thunderbolt a_Block to a_BlockPos
* Removed UTF-8 BOM (#4033)Lukas Pioch2017-09-191-1/+1
|
* Replace ItemCallbacks with lambdas (#3993)peterbell102017-09-117-116/+36
|
* Changed some int parameters to vector parameters (#3937)Bond-0092017-09-0721-93/+93
|
* Revert "Replace ItemCallbacks with lambdas (#3948)"LogicParrot2017-09-027-36/+116
| | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5.
* Replace ItemCallbacks with lambdas (#3948)peterbell102017-09-017-116/+36
|
* Merge pull request #3489 from cuberite/EntityOwnershipTiger Wang2017-08-181-4/+4
|\ | | | | * Changed entity ownership model to use smart pointers
| * Changed entity ownership model to use smart pointersTiger Wang2017-08-071-4/+4
| |
* | Changed int parameters to vector parameters in cCuboid and simulators (#3874)Lane Kolbly2017-08-1717-64/+59
|/
* Removed unneeded includes (#3902)Lukas Pioch2017-08-063-4/+0
|
* Remove double includes part 2 (#3890)peterbell102017-08-036-6/+0
|
* Removed unused forward declarations (#3888)Lukas Pioch2017-08-033-15/+0
|
* Increment fire block iteratorTiger Wang2017-07-211-0/+1
| | | | * Resolves potential deadlock
* Allocate redstone component handlers upfrontpeterbell102017-07-1722-299/+264
|
* Simulators: Added area-based wakeup.Mattes D2017-07-164-3/+87
|
* Added 1.12 blocks (#3760)Bond-0092017-06-301-3/+7
|
* FastRandom rewrite (#3754)peterbell102017-06-131-3/+3
|
* Clang 5.0 fixesLukas Pioch2017-05-212-2/+2
| | | | | - Added override keyword - Removed inherited member variables
* Added missing checks for Initialize function and updated APIDocLukas Pioch2017-05-081-1/+6
|
* Fix fence gates (#3683)Bond-0092017-04-291-0/+5
| | | This commit fixes an issue where a pressureplate would only open oak fence gates
* Added blocks that can be washed away by water (#3637)Bond-0092017-03-211-0/+10
|
* Updated sounds and effect IDs (#3422)mathiascode2017-02-154-5/+5
|
* Added some blocks and items (#3503)mathiascode2017-02-142-0/+10
|
* Fix comparator segfaultsMarvin Kopf2016-12-061-1/+8
| | | | The handler would get called for any BlockEntity, but not every BlockEntity is a BlockEntityWithItems. Downcasting with static_cast is UB on fail.
* Fixed type-casting-related warnings.Mattes D2016-08-242-13/+10
|
* Redstone fixes (#3285)Tiger Wang2016-07-312-52/+86
| | | | | | | | * Comparators and pistons no longer update instantly * Fixes #3168. * Consolidated comparator code * As a result, fixed an issue where GetPowerLevel didn't consider block entities behind it (only GetFrontPowerLevel did)
* Revert "Redstone fixes"Mattes D2016-07-292-86/+52
|
* Consolidated comparator codeTiger Wang2016-07-291-46/+37
| | | | | * As a result, fixed an issue where GetPowerLevel didn't consider block entities behind it (only GetFrontPowerLevel did)
* Comparators and pistons no longer update instantlyTiger Wang2016-07-292-12/+55
| | | | * Fixes #3168.
* CMake: Remove needless minimum version specifications.Mattes D2016-07-182-3/+0
|
* Revert "Made redstone handlers static"Lukas Pioch2016-07-012-93/+31
|
* - Add a activation flag to droppers and dispensers. Previously droppers and dispensers shot items with every block update.QUSpilPrgm2016-06-152-5/+28
| | | | - Fixes a range check inside cIncrementalRedstoneSimulator::Simulate
* Don't let redstone blocks power adjacent blocks. (#3214)QUSpilPrgm2016-05-282-3/+2
| | | | | * Don't let redstone blocks power adjacent blocks. This fixes issue #2966
* Made redstone handlers staticTiger Wang2016-05-282-31/+93
| | | | * Improvements to performance? Maybe. Can't hurt (he says).
* Update RedstoneSimulator to delete unused cached PowerDataMarvin Kopf2016-02-092-1/+10
| | | | When a new block was placed that has a corresponding RedstoneHandler the PowerData for the position was cached, but never deleted and remained unchanged when the block got destroyed. The RedstoneSimulator now erases all cached PowerData for positions where the block doesn't have a RedstoneHandler (i.e. Air).
* Bulk clearing of whitespaceLogicParrot2016-02-0518-83/+83
|
* Updated old forum linksMathias2016-01-312-2/+2
|
* Fixed issue #2218Austin Martin2016-01-111-3/+5
|
* Renamed leftover strings to Cuberite / Server, as needed.Mattes D2016-01-012-2/+2
| | | | Also upgraded the user setting file for MSVC to 2013.
* Removed excessive logging in redstone simulator.Mattes D2015-12-281-7/+0
|
* Silenced the Redstone Simulator console spamSafwat Halaby2015-12-2417-20/+20
|
* Fixes for clang-3.7Lukas Pioch2015-12-194-6/+6
|
* Reorganised the redstone simulatorTiger Wang2015-12-1829-2729/+2213
| | | | | | -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved
* Moved variables into scope, removed unused variables and fixed variablesLukas Pioch2015-12-171-1/+1
|
* Add enum for Sound and Particle EffectsDave Tucker2015-11-242-5/+6
| | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
* add sound to stone pressure platesGargaj2015-11-081-0/+9
| | | | add sound to stone pressure plates
* Merge pull request #2609 from bibo38/slimeblockworktycho2015-11-071-2/+2
|\ | | | | Slimeblock implementation
| * Refactored code to use vectors in the cPistonHandler classbibo382015-11-071-2/+2
| |
* | fix pressure plate power levelsGargaj2015-11-071-4/+4
|/
* Revert "Pressure plate fix"Mattes D2015-10-291-45/+14
|
* fixed pressure plate bugsSchwertspize2015-10-281-14/+45
|
* Unified the doxy-comment format.Mattes D2015-07-316-40/+46
|
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-294-22/+22
|
* Merge pull request #2362 from scribblemaniac/fix-redstoneTiger Wang2015-07-181-2/+4
|\ | | | | Fixed redstone issue
| * Fixed redstone issuescribblemaniac2015-07-171-2/+4
| | | | | | | | | | Fixed issue where glowstone blocks would block power transmission in some situations.
* | Merge pull request #2360 from bibo38/waterfixJulian Laubstein2015-07-161-3/+6
|\ \ | |/ |/| Now Water sources will also be created on top of existing water sources.
| * Now Water sources will also be created on top of existing water sources.bibo382015-07-151-3/+6
| | | | | | | | | | See also on http://minecraft.gamepedia.com/Water#Source_blocks Fixes #2097
* | Improved mapsTiger Wang2015-07-143-10/+10
|/
* Added moar commentsTiger Wang2015-06-072-13/+13
|
* Vector hasher is now a separate classTiger Wang2015-06-071-5/+7
|
* Use emplace to construct structuresTiger Wang2015-06-062-54/+61
|
* Improved link unpowering speedTiger Wang2015-06-061-48/+41
| | | | Also fixed compile errors
* Changed appropriate containers to unordered_mapTiger Wang2015-06-062-158/+85
| | | | | | Thanks to @worktycho for guidance! * Potential speed improvements
* Improved link power behaviourTiger Wang2015-06-062-163/+119
|
* Improved wires and repeatersTiger Wang2015-06-062-73/+152
| | | | | * Fixed repeater cross-chunk power detection + Re-implemented horizontal wire cut-off checking
* Fixed wire consuming much resourcesTiger Wang2015-06-061-7/+17
|
* Redstone wire and trapdoor fixesTiger Wang2015-06-062-310/+309
| | | | | | * Fixes #1887 * Fixes #1763 * Fixes #1083
* Provides improvements to redstone wireTiger Wang2015-06-062-94/+70
| | | | Intermediary commit that fixes #1763.
* ComparatorsTiger Wang2015-06-062-78/+180
|
* Fix commentstycho2015-05-284-9/+16
|
* Made -Weverything an error.tycho2015-05-245-10/+29
|
* Make -Werror disabling file onlytycho2015-05-192-1/+8
| | | | Ad fix a load of warnings
* More style checking.Mattes D2015-05-092-6/+6
| | | | Spaces around some operators are checked.
* Correct world height validations.Tommy Santerre2015-03-202-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 #1783bibo382015-03-191-1/+2
|
* Fixed type conversion warnings.Mattes D2015-01-181-1/+1
|
* Initial convertion of a_Dt to std::chronoTycho2015-01-1112-13/+13
| | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
* Fixed basic style.Mattes D2014-12-252-21/+69
|
* Fix repeater unpoweringTiger Wang2014-12-181-2/+4
|
* Merge pull request #1674 from gushromp/masterMattes D2014-12-171-8/+7
|\ | | | | Fix for water spreading on bottom of the world
| * Removed unneeded newlinesIvan Đorđević2014-12-171-6/+0
| |
| * Merge branch 'master' of https://github.com/gushromp/MCServergushromp2014-12-161-0/+1
| |\ | | | | | | | | | | | | Conflicts: src/Simulator/FloodyFluidSimulator.cpp
| | * Fixed water from spreading on bottom of worldgushromp2014-12-161-5/+8
| | |
| * | Fixed water from spreading on bottom of worldgushromp2014-12-161-7/+11
| |/
* | NULL -> nullptrTiger Wang2014-12-172-14/+18
| |
* | Merge branch 'master' into redstoneTiger Wang2014-12-131-1/+5
|\|
| * BasicStyle: Added missing braces to control statements.Mattes D2014-12-051-0/+2
| |
| * Fixed reported parentheses around comparisons.Mattes D2014-12-051-1/+3
| |
* | Improved redstone simulatorTiger Wang2014-10-292-818/+808
| | | | | | | | | | | | * Fixed style inconsistencies * Used more C++11 features * Improved speed perhaps
* | Cleaned up simulatorsTiger Wang2014-10-2513-2671/+2634
|/
* Merge pull request #1565 from mc-server/MergedIniFileMattes D2014-10-241-1/+1
|\ | | | | Merged ini file
| * Merged IniFile into main MCS sources.Mattes D2014-10-231-1/+1
| |
* | Fixed a crash in redstone simulator.Mattes D2014-10-231-1/+0
|/
* En masse NULL -> nullptr replaceTiger Wang2014-10-238-11/+11
|
* Functions in cPluginManager get references instead of pointers.Mattes D2014-10-151-2/+2
|
* Fixed iron trapdoorsHowaner2014-09-301-0/+1
|
* Use factory method to construct redstone simulator dataTycho2014-09-283-0/+12
|
* Fixed another redstone crash.madmaxoft2014-09-271-1/+6
|
* Wrapped clang-specific pragma into an #ifdef block.madmaxoft2014-09-271-1/+6
| | | | MSVC was complaining about an unknown pragma.
* Update IncrementalRedstoneSimulator.incworktycho2014-09-271-1/+1
|
* Update IncrementalRedstoneSimulator.incworktycho2014-09-271-1/+1
|
* Correct method name.worktycho2014-09-271-1/+1
|
* Set chunk dataworktycho2014-09-271-0/+5
|
* Merge pull request #1415 from Masy98/blocksMattes D2014-09-262-9/+57
|\ | | | | Added 1.8 Blocks and Items
| * Re-added 1.8 blocks to the redstone simulatorMasy982014-09-261-9/+46
| |
| * Merge branch 'master' into blocksMasy982014-09-2616-2617/+2649
| |\ | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHandler.cpp src/Simulator/IncrementalRedstoneSimulator.cpp
| * | Added blocks to the fire simulatorMasy982014-09-111-0/+11
| | |
| * | Added iron trapdoor, fence gates and doors to the redstone simulatorMasy982014-09-101-0/+11
| | |
* | | Merge branch 'master' of https://github.com/mc-server/MCServerTycho2014-09-261-1/+3
|\ \ \ | | |/ | |/|
| * | Fixed issue with castingtycho2014-09-261-1/+3
| | |
* | | Removed more unessicary includesTycho2014-09-261-0/+1
|/ /
* | Merge branch 'master' into redstoneTestsTycho2014-09-251-11/+23
|\ \ | | | | | | | | | | | | Conflicts: src/Simulator/IncrementalRedstoneSimulator.cpp
| * | Redstone: Fixed a crash with repeaters on a chunk border.madmaxoft2014-09-251-13/+22
| |/
* | Added first test to show the object can be createdTycho2014-09-176-30/+40
| |
* | IncrementalRedstoneSimulator now has no dependencies on cChunkTycho2014-09-164-364/+382
| |
* | Don't include IncrementalRedsonteSimulator.inc when in SELF_TEST modeTycho2014-09-111-5/+0
| |
* | Possibly decoupled IncrementalRedstoneSimulator from the rest of the serverTycho2014-09-1115-2318/+2324
|/ | | | THis wil hopefully allow for unit testing
* VanillaFluidSimulator: Fixed an invalid Y-coord query.Mattes D2014-08-291-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 NoteBlockTycho2014-08-051-11/+6
|
* Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity DirectlyTycho2014-08-051-5/+4
|
* CheckBasicStyle: multi-level indent change.madmaxoft2014-08-041-3/+3
|
* Added missing HOOK_BLOCK_SPREAD call.Howaner2014-08-011-6/+14
|
* Removed redundant semicolons and re-added warningarchshift2014-07-241-1/+1
|
* Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-212-4/+4
|
* Style: Normalized spaces after if, for and while.madmaxoft2014-07-212-4/+4
|
* Fixed style: spaces after commas.madmaxoft2014-07-192-6/+6
|
* Subdirs: Only add_library if not using MSVCarchshift2014-07-191-1/+3
|
* Simulator/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+28
|
* Fixed spaces before commas.madmaxoft2014-07-181-2/+2
|
* Fixed tabs used for alignment.madmaxoft2014-07-174-4/+4
|
* More trailing whitespace fixes.madmaxoft2014-07-171-4/+4
|
* Basic style fixes.madmaxoft2014-07-1710-21/+21
|
* Normalized comments.madmaxoft2014-07-176-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 crashTiger Wang2014-07-161-0/+7
|
* Fixed redstone simulator crashTiger Wang2014-07-152-8/+31
| | | | | * Fixes #1176 * Fixed #1186
* Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-133-10/+10
|
* Suggestions and bug fixTiger Wang2014-07-121-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
* SuggestionsTiger Wang2014-07-111-0/+3
|
* SuggestionsTiger Wang2014-07-111-1/+4
|
* Improved LinkedPowering speedTiger Wang2014-07-111-15/+15
| | | | * Additionally fixed wires powering other wires through blocks
* Fixed compilation and pressure platesTiger Wang2014-07-071-8/+4
|
* Implemented trapped chests & othersTiger Wang2014-07-072-83/+150
| | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
* Fixed c1deda5d8f01811efa5094e9375166acb69d50edTiger Wang2014-07-041-2/+2
| | | | I keep on breaking stuff :P
* Implemented tripwire(s) (hooks)Tiger Wang2014-06-282-15/+156
| | | | * Fixes #944
* Fixed bad water/redstone simulator communicationTiger Wang2014-06-281-32/+22
| | | | * Fixes #713
* Merge pull request #1105 from Howaner/BlocksMattes D2014-06-221-4/+10
|\ | | | | Added door and fence gate sounds.
| * Changed 0xFFFFFFFB to ~0x04Howaner2014-06-221-1/+1
| |
| * Merge branch 'master' into BlocksHowaner2014-06-171-2/+1
| |\
| * | Fix fence gate sound (Redstone simulator).Howaner2014-06-171-4/+10
| | |
* | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-06-221-2/+4
|\ \ \
| * | | Fixed missing breakworktycho2014-06-221-0/+1
| | | | | | | | | | | | Fixes CID 68409
| * | | Fixed invalid iteratorworktycho2014-06-221-2/+3
| | | | | | | | | | | | Fixes CID 60408
* | | | Fixed another daylight sensor bugTiger Wang2014-06-221-20/+23
|/ / / | | | | | | | | | Additionally fixed unpowering across chunks.
* | | Nullify deleted pointers.archshift2014-06-191-1/+3
| | |
* | | Merge pull request #1096 from mc-server/redstonerefactorAlexander Harkness2014-06-182-138/+66
|\ \ \ | |_|/ |/| | Moved delayed repeaters to be handled in a seperate pass
| * | FIxed second weird enumTycho2014-06-161-20/+1
| | |
| * | Refactored reversing logic into seperate functionTycho2014-06-161-14/+3
| | |
| * | Fixed tigers weird enumsTycho2014-06-161-14/+6
| | |
| * | Merge branch 'master' into redstonerefactorTycho2014-06-161-8/+29
| |\| | | | | | | | | | | | | Conflicts: src/Simulator/IncrementalRedstoneSimulator.cpp
| * | Moved repeater handling to seperate passTycho2014-06-162-97/+64
| | |
* | | Fix fence gate redstone simulator.Howaner2014-06-171-2/+1
| |/ |/|
* | 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