-
-
Notifications
You must be signed in to change notification settings - Fork 137
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* basic setup * adding quickgraph * add electric device interface * making vertex coordinates * getting back tileobjects from coordinates * handle power in circuits * add edges when adding electric device * add generator prefab * add interface implementations * add switch light script * add electric connectors * simple electric adjacency connector * updating electric prefabs and adding battery script * little fix and prefab update * update stuff * LITTLE FIX * fix asset grid ref * disable all unnecessary components * fix stuff * some fix * some fix * allow disabling destroy logic * remove item code * fix null exception * fix unwanted diagonal connections * fix some null ref exceptions and refactor code * mostly doc * refactor and doc * refactor * remove the call destroy stuff on actors * add sound for fuel power generator * add togglable generator * fix generator asset * add smess batteries * add id for fuel powered generator sound * Remove electric stuff * removed more electric stuff * smes battery power level update * make pacman vibrate * fix power status update * fix cable connections * fix battery usage now batteries have a max rate of power they can output * power rate display on SMES * fix left over power not helping batteries * Add battery input display * add toggling of batteries * doc and clean up * add tick based rate for electricity * some doc * fix to make build work * fix build * fix some stuff client side * fix battery client syncing * fix solar panel and add network object * remove useless prefab * fix solar panel asset * replaced fuel power generator sound and added looping option * isolate vibrate logic * Delete Assets/Content/Data/TileMap/Resources/Furniture/Machines/Electricity.meta * fix merge issues * fix generator sound * fix broken stuff * fix cable not updating when deleting them * add doc and clean up * Cleanup * Cleanup 2: electric boogaloo * change on tick to fixed update * simplify battery consuming method * little comment * Cleanup 3 * Cleanup 3 * Cleanup 18 * removed unused method * probably infinite loop * charge storages properly * moving generic toggle to interaction * fix prefabs * use min max method * renaming * Remove extra strings * Implement charge and drain algorithms * fix exception when removing smes * Revert "Implement charge and drain algorithms" This reverts commit 2e92541. * solve merge conflict --------- Co-authored-by: Mechar418 <[email protected]>
- Loading branch information
1 parent
92d2b89
commit a67b12c
Showing
71 changed files
with
2,095 additions
and
108 deletions.
There are no files selected for viewing
3 changes: 2 additions & 1 deletion
3
...nerating/cecil-0.11.4/Mono.Cecil.sln.meta → Assets/Art/Sound/Furniture.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
3 changes: 2 additions & 1 deletion
3
...Tugboat/LiteNetLib/LiteNetLib.csproj.meta → Assets/Art/Sound/Furniture/Machines.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Binary file added
BIN
+77.3 KB
Assets/Art/Sound/Furniture/Machines/Engineering/FuelPowerGenerator.ogg
Binary file not shown.
22 changes: 22 additions & 0 deletions
22
Assets/Art/Sound/Furniture/Machines/Engineering/FuelPowerGenerator.ogg.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.