Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* use Icraftable interface in crafting system instead of items * add craftablke tile objects * make wall craftable * add build walls * added IRecipeIngredient interface * make building wall kinda work * partial new asset integration * fixing crafting * partial drag stuff around * add some building interactions * fix placing crafted tile objects * fix shot not spawning properly * fix dragging with item in hand * add construction particles * adding particles when crafting * add screwdriver sound * add sounds when screwing * fix audio bug, build, and rename * fix crafting system encapsulation * some doc and adding the transform target field * move ingredients in smoke * adding multi step crafting for girders * work on adding sheets on walls * complete girder craftable * modify craftable interface * simplify crafting interactions and add modify * fix step number increase and mesh * update replace in interactions * refactor and some doc * fix smoke not cancelling * fix distance order of item chosen * allow multiple adjacency connectors for girder * remove passing instance to Icraftable interface * make tube light work without electricity * Add a bunch of sounds * remove assemble interaction * remove replace in bolt interaction * replacing strings with enum for crafting type * Adding build source for hands * bolt using enum craftiung type * allow craft in hand * remove item consume and craft * add handcrafting * drag stuff half convincingly * some doc * start applying design * big changes * adding crafting menu when multiple options (WIP) * start changing recipes * add a bunch of asset for database assets stuff * adding recipes and crafting slots * remove shit * some progress on crafting menu * changes steel wall recipes and fix delayed interactions * update some settings * add reinforced stuff on the girder recipe * add deconstruction process * make crafting menu not networked * change crafting menu * improve crafting menu * make crafting thing possible to deconstruct * add some deconstruction on walls * update construction system a lot * remove tool sounds * update sounds group * update sounds.asset * consume before spawning * add multi connector and update girder * cleanup, doc, and use time from recipe link * make steel wall to girder recipe and make conditions work * add a basic recipe editor window * working layout algorithm for graphs * add colors and recipe step names * add ability to zoom/dezoom and pan the recipe window * add minimum force criteria * better lines and arrow heads * some cleanup * deal with null ref * make algorithm generic * stop when reaching minimum force * make text dynamic * add some recipe step and fix knife * some doc * open menu only if more than one option * improve crafting menu * improve crafdting menu * highlight selected button * fix bug on recipe editor * fix missing scripts * Update EngineeringBorg.prefab * Update FloorTile.prefab * Update JumpsuitEngineer.prefab * remove slot part prefab * remove missing scripts * gets back to single connector for placed tile objects * Update CablesAdjacencyConnector.cs * single step result, some doc and cleanup * move scripts * doc and cleanup * some doc * Update WoodLog.prefab * Update PlasmaTank.prefab * Update ElectricalCable.prefab * Update GlassShard.prefab * Update WoodPlank.prefab * Update MatterBin.prefab * Update MicroLaser.prefab * Update ElectricalWire.prefab * Update Medkit.prefab * Update Hatchet.prefab * Update item.cs * some doc * cleanup and doc * add doc * cleanup small fix * simplify crafting interactions and doc * Delete Builds/Game/Data/Tilemaps/constructionMap.json * clean up and doc * add basics for crafting editor window * update custom recipe editor * fix editor build issues * first attempt at networking * fix modifications of walls not showing * fix spawning on top of players * Add ability to add step to recipe and fix some recipes * fix recipes and some client stuff * fix loading bar * some error logs * fix client crafting smoke * fix knife and cleanup * cleanup * cleanup * cleanup * fix small merge issue * remove is expanded checks * add steelgirder unbolted item so * Revert "Merge branch 'develop' into add-construction" This reverts commit 6c792df, reversing changes made to 213cf29. * Revert "Revert "Merge branch 'develop' into add-construction"" This reverts commit fccbe4b. * fix after merge * Cleanup 1 * Cleanup 2 * Cleanup 3 * simplify doc * add ingredients from hand * Debug -> Log * simplify craft method * fix fishnet scene ids * add getter * Replace coroutines with DOMove * Fix camera lock after building * Oops, actually fix the camera * Add a crutch to fix duplicated secondary results * update test station for testing purposes * remove steelsheet duplicate asset * return if target asset reference is null * Rename things, replace string consts * Improve secondary results * Improve secondary results, fix menu slots * Add missing reference * Rename interactions * Adjust font * Implement close button * Fix mesh bug * Remove string constant * Rename stuff, use switch case * Move stuff around * Add welder to teststation * Simplify CraftingRecipeEditor, rename properties in assets * Add NaughtyAttributes, make steps look good * Improve visualiser * fixed some style and missing assembly ref * fix steelsheetrecipe * add tooltips * fix merge assembly issue * modify tooltip and comment --------- Co-authored-by: Mechar418 <iamteapot42@gmail.com>
- Loading branch information
1 parent
e9db54c
commit 320e2ba