{"payload":{"feedbackUrl":"https://github.com/orgs/community/discussions/53140","repo":{"id":200907813,"defaultBranch":"develop","name":"SS3D","ownerLogin":"RE-SS3D","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2019-08-06T18:56:16.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/42778640?v=4","public":true,"private":false,"isOrgOwned":true},"refInfo":{"name":"","listCacheKey":"v0:1714533130.0","currentOid":""},"activityList":{"items":[{"before":"eab45aeca21108140a618a77933af8f3370003d4","after":"aa234f6bc3cfd83d2818a1412ce8c97677cdecd3","ref":"refs/heads/develop","pushedAt":"2024-05-06T06:34:27.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"iamteapot422","name":"Iamteapot","path":"/iamteapot422","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/77565416?s=80&v=4"},"commit":{"message":"Update Game Version (#1441)\n\n* Update ProjectSettings.asset\r\n\r\n* Update ProjectSettings.asset\r\n\r\n* Update ProjectSettings.asset","shortMessageHtmlLink":"Update Game Version (#1441)"}},{"before":"1fdb32a222a69cdd39af4fd74c079e037fd8c12b","after":"eab45aeca21108140a618a77933af8f3370003d4","ref":"refs/heads/develop","pushedAt":"2024-04-01T00:41:39.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"joaoburatto","name":"João Buratto","path":"/joaoburatto","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/46575243?s=80&v=4"},"commit":{"message":"Add simple Game Settings #1281 (#1431)\n\n* Add UserInterfaceSettings script and fix BandwidthView not showing\r\n\r\n* Add category and interactive elements prefabs to the Game scene\r\n\r\n* Change UserInterfaceSettings to GlobalUiVisibilityControllerView","shortMessageHtmlLink":"Add simple Game Settings #1281 (#1431)"}},{"before":"6222a50d0cd55ae4aebc1cabb49467ad42004610","after":"1fdb32a222a69cdd39af4fd74c079e037fd8c12b","ref":"refs/heads/develop","pushedAt":"2024-03-15T00:10:56.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Fix large wall mount clipping (#1347) (#1433)\n\n* Fix large wall mount clipping (#1347)\r\n\r\n* Set isLarge on the wall mounts that clip","shortMessageHtmlLink":"Fix large wall mount clipping (#1347) (#1433)"}},{"before":"80948fd2299fd5f930a550f47a63d4bea4c74729","after":"6222a50d0cd55ae4aebc1cabb49467ad42004610","ref":"refs/heads/develop","pushedAt":"2024-03-10T12:02:53.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Fix inventory slots list not resetting after destroying all slots (#1434)\n\nThe Slots list was keeping a list of destroyed slots between rounds, breaking the order of slots after the first round","shortMessageHtmlLink":"Fix inventory slots list not resetting after destroying all slots (#1434"}},{"before":"dc6f212a33adbe4fc73d79b05243e69183748edd","after":"80948fd2299fd5f930a550f47a63d4bea4c74729","ref":"refs/heads/develop","pushedAt":"2024-03-05T11:33:31.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Update ProjectSettings.asset (#1432)","shortMessageHtmlLink":"Update ProjectSettings.asset (#1432)"}},{"before":"5a8c35b59cc7969cf2b0c0c19c4f1f880b9be8f9","after":"dc6f212a33adbe4fc73d79b05243e69183748edd","ref":"refs/heads/develop","pushedAt":"2024-03-05T11:16:03.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Port Chat from Outdated branch (#1426)\n\n* Port chat from outdated version\r\n\r\nhttps://github.com/RE-SS3D/SS3D/pull/89\r\n\r\n* Make ChatRegister non-NetworkBehaviour and deattach from Human\r\n\r\n* Unify ChatRegister and ChatWindow\r\n\r\n* Fix NRE when dragging tabs in chat\r\n\r\n* Fix ChatWindow missing script\r\n\r\n* Remove unused ChatWindow2\r\n\r\n* Remove AutoExpandGridLayoutGroup\r\n\r\n* Fix can't move ChatWindow\r\n\r\n* Clean ResizePanel.cs\r\n\r\n* Clean TabCreator.cs\r\n\r\n* Remove unused ToggleChat.cs\r\n\r\n* Clean ChatChannel.cs\r\n\r\n* Clean ChatChannels.cs\r\n\r\n* Clean ChatTabData.cs\r\n\r\n* Clean ChatFilterOption.cs\r\n\r\n* Re-add multiple chats windows functionality\r\n\r\n* Update ChatWindow.prefab\r\n\r\n* Make ToggleChats work for all windows\r\n\r\n* Clean ChatWindow + avoid some input while writing\r\n\r\n* Undo ugly solution for blocking input while writing in chat\r\n\r\n* Change chat input to ControlsOffInputText\r\n\r\n* Add SendChatMessage input control\r\n\r\n* Let players remove chat windows with one tab\r\n\r\n* Move ChatChannels to ScriptableObjects\r\n\r\n* Add role required to chat channels\r\n\r\n* Add chat to lobby\r\n\r\n* Undo Game.unity changes from port\r\n\r\n* Fix can't drag ChatWindow in-game\r\n\r\n* Add formattable channels\r\n\r\n* Add distance-based chats\r\n\r\n* Add prefix/suffix option for chat channels\r\n\r\n* Add \"hide sender name\" option for chat channels\r\n\r\n* Update HideSender values of some channels\r\n\r\n* Split ChatWindow into Lobby and InGameChatWindow\r\n\r\n* Fix duplicated client chat messages\r\n\r\n* Add system to make chat channels depend on headset\r\n\r\nUses traits in the headset. For example, Security channel has the Security headset. Creating a headset and adding the Security trait will enable that channel\r\n\r\n* Improve channels workflow\r\n\r\n* Fix comparison between traits not working correctly\r\n\r\nThis is a weird issue that only happens on the client but not on the host. The type of the same two traits returns a different value, the first trait that is getting compared returns the general/main object type (Trait) while the second returns the specific type. For example, Security trait returns \"Trait\" object type for item 1 being compared, while the same trait returns \"IDPermission\" object type for item 2\r\n\r\n* Add a simple log for the chat\r\n\r\nIt's really simple and unoptimized, but does the trick (for now). Chat log can be found with the rest of logs (Game > Logs)\r\n\r\n* Add tabName to ChatChannels\r\n\r\n* Add tooltips to ChatChannel ScriptableObject\r\n\r\n* Improve a bit the visuals of the ChatWindows\r\n\r\n* Block camera zoom when hovering a chat\r\n\r\n* Fix available channels not syncing in client\r\n\r\n* Fix nomenclature of fields\r\n\r\n* Use ViewLocator in ToggleChats\r\n\r\n* Remove ternary operator when getting tab name\r\n\r\n* Fix wrong capitalization on AvailableChannels\r\n\r\n* Add OnAvailableChannelsChanged method\r\n\r\n* Rename ChatFilterOption Init to Setup\r\n\r\n* Improve ChatFilterOptionToggleUI readability\r\n\r\n* Rename ChatTab variables for readability\r\n\r\n* Rename ChatTab Init to Setup\r\n\r\n* Cache transforms in ChatTab\r\n\r\n* Set correct name to new tab button in ChatTab\r\n\r\n* Remove msg abbreviation in ChatWindow\r\n\r\n* Convert ChatMessageSender to ChatSystem\r\n\r\n* Add RegisteredChatChannels dictionary to ChatSystem\r\n\r\n* Add ToString method to ChatMessage\r\n\r\n* Convert ChatChannels to ScriptableSettings\r\n\r\n* Remove unused var in ChatWindow\r\n\r\n* Remove defaultChat var from InGameChatWindow\r\n\r\n* Fix tabs in ResizePanel\r\n\r\n* Remove UI responsibility of ChatSystem\r\n\r\n* Fix missing references\r\n\r\n* Clean ChatSystem code\r\n\r\n* Fix new tabs not syncing available channels correctly\r\n\r\n* Add NotImplementedException to ChatWindow GetCurrentChatChannel\r\n\r\n* Fix controls enabled while writing tab name\r\n\r\n* Add scroll to tabs row\r\n\r\n* Add HeadsetSecurity (Left/Right)\r\n\r\n* Update UI to match a bit more the UI design\r\n\r\nhttps://ss3d.gitbook.io/design/basic-game-mechanics/user-interface/game/player-hud\r\n\r\n* Move chat formatting to original client + tweaks to match design\r\n\r\nNow chat formatting is done only by the original client who sents the message, so the rest of players receive the message already formatted\r\nAlso updated how text is displayed to match the UI design (https://ss3d.gitbook.io/design/basic-game-mechanics/user-interface/game/player-hud)\r\n\r\n* Rename channel General to Local\r\n\r\n* Add LOOC channel\r\n\r\n* Add StationAlerts channel\r\n\r\n* Add more options for ChatChannels\r\n\r\n* Remove player joined message\r\n\r\n* Add welcome to the ship message on round start\r\n\r\n* Add character joined message for late joining\r\n\r\n* Add General trait to headsets + required traits to channels\r\n\r\n* Update ChatChannels list\r\n\r\n* Fix late join message being sent by player\r\n\r\n* Remove \"Character\" from in-game chat name\r\n\r\n* Fix headset left floating on clients","shortMessageHtmlLink":"Port Chat from Outdated branch (#1426)"}},{"before":"677019478b5824caf967045d52efb560d0d7e6d1","after":"5a8c35b59cc7969cf2b0c0c19c4f1f880b9be8f9","ref":"refs/heads/develop","pushedAt":"2024-02-25T12:08:28.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Changed folders to PascalCase (#1275) (#1430)","shortMessageHtmlLink":"Changed folders to PascalCase (#1275) (#1430)"}},{"before":"6d75c2f40ed91e03e95b7e0e03f0e5239f764801","after":"677019478b5824caf967045d52efb560d0d7e6d1","ref":"refs/heads/develop","pushedAt":"2024-02-25T11:41:01.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Fix item collider (#1417)\n\n* Fix item colliders\r\n\r\n* Fix everything\r\n\r\n* Fish fears me\r\n\r\n* Sausages\r\n\r\n* Move stuff to Freeze/Unfreeze\r\n\r\n* add comment\r\n\r\n* Fix wrong component\r\n\r\n* Add a comment to _container and Container\r\n\r\n---------\r\n\r\nCo-authored-by: Mechar418 <77565416+Mechar418@users.noreply.github.com>\r\nCo-authored-by: stilnat ","shortMessageHtmlLink":"Fix item collider (#1417)"}},{"before":"17356a94bd7402ee27e241020331dfb0e09649b4","after":"6d75c2f40ed91e03e95b7e0e03f0e5239f764801","ref":"refs/heads/develop","pushedAt":"2024-02-23T16:40:28.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Change Start() to Awake() (#1427)","shortMessageHtmlLink":"Change Start() to Awake() (#1427)"}},{"before":"42dc8898f332cf989a09320ccbcf7d15f44dcf6d","after":"17356a94bd7402ee27e241020331dfb0e09649b4","ref":"refs/heads/develop","pushedAt":"2024-02-21T10:55:15.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"joaoburatto","name":"João Buratto","path":"/joaoburatto","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/46575243?s=80&v=4"},"commit":{"message":"fix exception (#1423)","shortMessageHtmlLink":"fix exception (#1423)"}},{"before":"b6e19355948d747ccb169bd87669f1898e68df7d","after":"42dc8898f332cf989a09320ccbcf7d15f44dcf6d","ref":"refs/heads/develop","pushedAt":"2024-02-21T00:12:43.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"joaoburatto","name":"João Buratto","path":"/joaoburatto","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/46575243?s=80&v=4"},"commit":{"message":"fix disappearing clothes (#1422)","shortMessageHtmlLink":"fix disappearing clothes (#1422)"}},{"before":"8beb708e18c5b89596534af0378dadb1fd623af6","after":"b6e19355948d747ccb169bd87669f1898e68df7d","ref":"refs/heads/develop","pushedAt":"2024-02-18T14:54:16.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Improve application flow (#1287)\n\n* Rework how the application is initialized and how the network settings are set\r\n\r\n* Rework how application is initialized\r\n\r\n* Fix issues with rebase and add documentation\r\n\r\n* Fix rebase errors\r\n\r\n* Fixed issues with the rebase\r\n\r\n* Fix assemblies and add docs to SceneSystem\r\n\r\n* Fix build error related to Editor imports on Item.cs\r\n\r\n* Remove unused class\r\n\r\n* Fix issue with launcher checks and conflict errors\r\n\r\n* Remove prefab that caused tests to fail\r\n\r\n* Update some values to fix intro","shortMessageHtmlLink":"Improve application flow (#1287)"}},{"before":"adcab190a7c402bb6f555921151d6dbc525c72e2","after":"8beb708e18c5b89596534af0378dadb1fd623af6","ref":"refs/heads/develop","pushedAt":"2024-02-16T22:20:35.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Add missing filters to slot inventories (#1425)\n\n* Add Belt trait and filter\r\n\r\n* Set up Belt trait and filter\r\n\r\n* Set up IDSlot filter","shortMessageHtmlLink":"Add missing filters to slot inventories (#1425)"}},{"before":"a91b72f374dc83770c7d4d99f1331df5bd048d2d","after":"adcab190a7c402bb6f555921151d6dbc525c72e2","ref":"refs/heads/develop","pushedAt":"2024-02-02T13:19:17.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Anchor build menu buttons to the top (#1421)\n\n* Anchor build menu buttons at the top\r\n\r\nCloses #1402\r\n\r\n* Update ConstructionMenu.prefab\r\n\r\n* add \"Vertical Layout Group\" to the MainPanel\r\n* add \"Layout Element\" to the: BuildMenu, Panel\r\n* remove TileSearchAndBuild's \"Vertical Layout Group\" paddings\r\n\r\n* Change colors to float values\r\n\r\nChanged Colors to float values and shifted them a bit\r\n\r\n* Change LoadTab Active field\r\n\r\nAdded Activating/Disabling the root of the LoadTab","shortMessageHtmlLink":"Anchor build menu buttons to the top (#1421)"}},{"before":"75506a2810b2fa141f914c6b4a9aef612b1bdfdf","after":"a91b72f374dc83770c7d4d99f1331df5bd048d2d","ref":"refs/heads/develop","pushedAt":"2024-02-01T08:58:45.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Update PosterVertical.prefab (#1419)\n\nRemove rigidbody, add networkObject\r\nFixes #1357","shortMessageHtmlLink":"Update PosterVertical.prefab (#1419)"}},{"before":"85a4c23b95dbeba43de237316adc1dee33302e40","after":"75506a2810b2fa141f914c6b4a9aef612b1bdfdf","ref":"refs/heads/develop","pushedAt":"2024-02-01T05:22:52.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"iamteapot422","name":"Iamteapot","path":"/iamteapot422","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/77565416?s=80&v=4"},"commit":{"message":"Version update (#1420)\n\n* Update ProjectSettings.asset\r\n\r\nyeah\r\n\r\n* Remove extra meta files","shortMessageHtmlLink":"Version update (#1420)"}},{"before":"6f2403d52e04f49d069db2cdaa6cbcbe199fb611","after":"85a4c23b95dbeba43de237316adc1dee33302e40","ref":"refs/heads/develop","pushedAt":"2024-01-30T11:22:18.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"iamteapot422","name":"Iamteapot","path":"/iamteapot422","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/77565416?s=80&v=4"},"commit":{"message":"generate world references (#1418)\n\n* generate world references\r\n\r\n* automatic update on prefab with world asset references","shortMessageHtmlLink":"generate world references (#1418)"}},{"before":"d4658dc4ad7dc88c61e8635e9a25c8a085b67f71","after":"6f2403d52e04f49d069db2cdaa6cbcbe199fb611","ref":"refs/heads/develop","pushedAt":"2024-01-27T10:06:13.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Activate ragdoll after death (#1412)\n\nAll good, will just need to fix the item/body collision I'm opening an issue for that","shortMessageHtmlLink":"Activate ragdoll after death (#1412)"}},{"before":"b53dd2316051aac87d81a9bbb68804acf1ba8369","after":"d4658dc4ad7dc88c61e8635e9a25c8a085b67f71","ref":"refs/heads/develop","pushedAt":"2024-01-05T13:11:47.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"iamteapot422","name":"Iamteapot","path":"/iamteapot422","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/77565416?s=80&v=4"},"commit":{"message":"Improve Circuit algorithms (#1413)\n\n* Improve Circuit algorithms\r\n\r\n* Add test\r\n\r\n* Fix power distribution\r\n\r\n* Optimize again\r\n\r\n* Revert \"Optimize again\"\r\n\r\nThis reverts commit 884daf067b7ab9c24366803e026f13991aac840e.\r\n\r\n* Add comment\r\n\r\n* Add test\r\n\r\n* Remove if, add log, add comment\r\n\r\n* fix error log\r\n\r\n---------\r\n\r\nCo-authored-by: Mechar418 <77565416+Mechar418@users.noreply.github.com>\r\nCo-authored-by: stilnat ","shortMessageHtmlLink":"Improve Circuit algorithms (#1413)"}},{"before":"a0c37eff2774ace739ec15480a3d37f87b607b84","after":"b53dd2316051aac87d81a9bbb68804acf1ba8369","ref":"refs/heads/develop","pushedAt":"2024-01-04T11:14:09.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"iamteapot422","name":"Iamteapot","path":"/iamteapot422","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/77565416?s=80&v=4"},"commit":{"message":"Electricity tests (#1415)\n\n* basic setup\r\n\r\n* adding quickgraph\r\n\r\n* add electric device interface\r\n\r\n* making vertex coordinates\r\n\r\n* getting back tileobjects from coordinates\r\n\r\n* handle power in circuits\r\n\r\n* add edges when adding electric device\r\n\r\n* add generator prefab\r\n\r\n* add interface implementations\r\n\r\n* add switch light script\r\n\r\n* add electric connectors\r\n\r\n* simple electric adjacency connector\r\n\r\n* updating electric prefabs and adding battery script\r\n\r\n* little fix and prefab update\r\n\r\n* update stuff\r\n\r\n* LITTLE FIX\r\n\r\n* fix asset grid ref\r\n\r\n* disable all unnecessary components\r\n\r\n* fix stuff\r\n\r\n* some fix\r\n\r\n* some fix\r\n\r\n* allow disabling destroy logic\r\n\r\n* remove item code\r\n\r\n* fix null exception\r\n\r\n* fix unwanted diagonal connections\r\n\r\n* fix some null ref exceptions and refactor code\r\n\r\n* mostly doc\r\n\r\n* refactor and doc\r\n\r\n* refactor\r\n\r\n* remove the call destroy stuff on actors\r\n\r\n* add sound for fuel power generator\r\n\r\n* add togglable generator\r\n\r\n* fix generator asset\r\n\r\n* add smess batteries\r\n\r\n* add id for fuel powered generator sound\r\n\r\n* Remove electric stuff\r\n\r\n* removed more electric stuff\r\n\r\n* smes battery power level update\r\n\r\n* make pacman vibrate\r\n\r\n* fix power status update\r\n\r\n* fix cable connections\r\n\r\n* fix battery usage\r\n\r\nnow batteries have a max rate of power they can output\r\n\r\n* power rate display on SMES\r\n\r\n* fix left over power not helping batteries\r\n\r\n* Add battery input display\r\n\r\n* add toggling of batteries\r\n\r\n* doc and clean up\r\n\r\n* add tick based rate for electricity\r\n\r\n* some doc\r\n\r\n* fix to make build work\r\n\r\n* fix build\r\n\r\n* fix some stuff client side\r\n\r\n* fix battery client syncing\r\n\r\n* fix solar panel and add network object\r\n\r\n* remove useless prefab\r\n\r\n* fix solar panel asset\r\n\r\n* replaced fuel power generator sound and added looping option\r\n\r\n* isolate vibrate logic\r\n\r\n* Delete Assets/Content/Data/TileMap/Resources/Furniture/Machines/Electricity.meta\r\n\r\n* fix merge issues\r\n\r\n* fix generator sound\r\n\r\n* fix broken stuff\r\n\r\n* fix cable not updating when deleting them\r\n\r\n* add doc and clean up\r\n\r\n* Cleanup\r\n\r\n* Cleanup 2: electric boogaloo\r\n\r\n* change on tick to fixed update\r\n\r\n* simplify battery consuming method\r\n\r\n* little comment\r\n\r\n* Cleanup 3\r\n\r\n* Cleanup 3\r\n\r\n* Cleanup 18\r\n\r\n* removed unused method\r\n\r\n* probably infinite loop\r\n\r\n* charge storages properly\r\n\r\n* moving generic toggle to interaction\r\n\r\n* fix prefabs\r\n\r\n* use min max method\r\n\r\n* renaming\r\n\r\n* Remove extra strings\r\n\r\n* Implement charge and drain algorithms\r\n\r\n* fix exception when removing smes\r\n\r\n* Revert \"Implement charge and drain algorithms\"\r\n\r\nThis reverts commit 2e925417b6afa08183c7f432f8698d2e6fadd426.\r\n\r\n* add empty tests\r\n\r\n* rename and electric system test\r\n\r\n* simple set up for tests\r\n\r\n* implement circuit tests\r\n\r\n* add margin error and fix one test\r\n\r\n* Rename thing\r\n\r\n---------\r\n\r\nCo-authored-by: Mechar418 <77565416+Mechar418@users.noreply.github.com>","shortMessageHtmlLink":"Electricity tests (#1415)"}},{"before":"20340c0be293f915c9a0a0d95d9b5a2ee5c901b5","after":"a0c37eff2774ace739ec15480a3d37f87b607b84","ref":"refs/heads/develop","pushedAt":"2024-01-02T03:52:11.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"iamteapot422","name":"Iamteapot","path":"/iamteapot422","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/77565416?s=80&v=4"},"commit":{"message":"Update ProjectSettings.asset (#1411)","shortMessageHtmlLink":"Update ProjectSettings.asset (#1411)"}},{"before":"a67b12cfdeeff65d64ba92d70b5518a94775d1ab","after":"20340c0be293f915c9a0a0d95d9b5a2ee5c901b5","ref":"refs/heads/develop","pushedAt":"2023-12-30T00:51:38.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"New maps (#1410)\n\n* Update ministation.json\r\n\r\n* new maps\r\n\r\n* Update ministation.json\r\n\r\nadd wires","shortMessageHtmlLink":"New maps (#1410)"}},{"before":"92d2b89512bc5ccc226531658241fc1832b446d5","after":"a67b12cfdeeff65d64ba92d70b5518a94775d1ab","ref":"refs/heads/develop","pushedAt":"2023-12-29T11:52:45.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"iamteapot422","name":"Iamteapot","path":"/iamteapot422","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/77565416?s=80&v=4"},"commit":{"message":"Electricity system (#1371)\n\n* basic setup\r\n\r\n* adding quickgraph\r\n\r\n* add electric device interface\r\n\r\n* making vertex coordinates\r\n\r\n* getting back tileobjects from coordinates\r\n\r\n* handle power in circuits\r\n\r\n* add edges when adding electric device\r\n\r\n* add generator prefab\r\n\r\n* add interface implementations\r\n\r\n* add switch light script\r\n\r\n* add electric connectors\r\n\r\n* simple electric adjacency connector\r\n\r\n* updating electric prefabs and adding battery script\r\n\r\n* little fix and prefab update\r\n\r\n* update stuff\r\n\r\n* LITTLE FIX\r\n\r\n* fix asset grid ref\r\n\r\n* disable all unnecessary components\r\n\r\n* fix stuff\r\n\r\n* some fix\r\n\r\n* some fix\r\n\r\n* allow disabling destroy logic\r\n\r\n* remove item code\r\n\r\n* fix null exception\r\n\r\n* fix unwanted diagonal connections\r\n\r\n* fix some null ref exceptions and refactor code\r\n\r\n* mostly doc\r\n\r\n* refactor and doc\r\n\r\n* refactor\r\n\r\n* remove the call destroy stuff on actors\r\n\r\n* add sound for fuel power generator\r\n\r\n* add togglable generator\r\n\r\n* fix generator asset\r\n\r\n* add smess batteries\r\n\r\n* add id for fuel powered generator sound\r\n\r\n* Remove electric stuff\r\n\r\n* removed more electric stuff\r\n\r\n* smes battery power level update\r\n\r\n* make pacman vibrate\r\n\r\n* fix power status update\r\n\r\n* fix cable connections\r\n\r\n* fix battery usage\r\n\r\nnow batteries have a max rate of power they can output\r\n\r\n* power rate display on SMES\r\n\r\n* fix left over power not helping batteries\r\n\r\n* Add battery input display\r\n\r\n* add toggling of batteries\r\n\r\n* doc and clean up\r\n\r\n* add tick based rate for electricity\r\n\r\n* some doc\r\n\r\n* fix to make build work\r\n\r\n* fix build\r\n\r\n* fix some stuff client side\r\n\r\n* fix battery client syncing\r\n\r\n* fix solar panel and add network object\r\n\r\n* remove useless prefab\r\n\r\n* fix solar panel asset\r\n\r\n* replaced fuel power generator sound and added looping option\r\n\r\n* isolate vibrate logic\r\n\r\n* Delete Assets/Content/Data/TileMap/Resources/Furniture/Machines/Electricity.meta\r\n\r\n* fix merge issues\r\n\r\n* fix generator sound\r\n\r\n* fix broken stuff\r\n\r\n* fix cable not updating when deleting them\r\n\r\n* add doc and clean up\r\n\r\n* Cleanup\r\n\r\n* Cleanup 2: electric boogaloo\r\n\r\n* change on tick to fixed update\r\n\r\n* simplify battery consuming method\r\n\r\n* little comment\r\n\r\n* Cleanup 3\r\n\r\n* Cleanup 3\r\n\r\n* Cleanup 18\r\n\r\n* removed unused method\r\n\r\n* probably infinite loop\r\n\r\n* charge storages properly\r\n\r\n* moving generic toggle to interaction\r\n\r\n* fix prefabs\r\n\r\n* use min max method\r\n\r\n* renaming\r\n\r\n* Remove extra strings\r\n\r\n* Implement charge and drain algorithms\r\n\r\n* fix exception when removing smes\r\n\r\n* Revert \"Implement charge and drain algorithms\"\r\n\r\nThis reverts commit 2e925417b6afa08183c7f432f8698d2e6fadd426.\r\n\r\n* solve merge conflict\r\n\r\n---------\r\n\r\nCo-authored-by: Mechar418 <77565416+Mechar418@users.noreply.github.com>","shortMessageHtmlLink":"Electricity system (#1371)"}},{"before":"d8fbba2c636df50cc01ab2ccdd0ac433427e11a2","after":"92d2b89512bc5ccc226531658241fc1832b446d5","ref":"refs/heads/develop","pushedAt":"2023-12-29T04:48:12.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Fix hotkeys (#1408)\n\n* Fix\r\n\r\n* Add OnDestroyed\r\n\r\n* i forgor\r\n\r\n---------\r\n\r\nCo-authored-by: Mechar418 <77565416+Mechar418@users.noreply.github.com>","shortMessageHtmlLink":"Fix hotkeys (#1408)"}},{"before":"f4220e4efc8664e094ced4de680c440158fc8121","after":"d8fbba2c636df50cc01ab2ccdd0ac433427e11a2","ref":"refs/heads/develop","pushedAt":"2023-12-27T13:37:33.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"iamteapot422","name":"Iamteapot","path":"/iamteapot422","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/77565416?s=80&v=4"},"commit":{"message":"Add Generic Models 2 (#1405)\n\n* Update jumpsuits prefabs\r\n\r\nadded folded jumpsuits and made them prefab variants\r\n\r\n* jumpsuit data fixes\r\n\r\n* Add a few machines\r\n\r\n* gibber and sink data\r\n\r\n* Chemical machine data\r\n\r\n* asset data\r\n\r\n* asset database\r\n\r\n* Add machine frame\r\n\r\n* Update MachineFrame.prefab\r\n\r\nnaming\r\n\r\n* Add part slots to machine frame\r\n\r\nAdd part slots to machine frame\r\n\r\n* machine parts\r\n\r\n* fix\r\n\r\n* Add medkit\r\n\r\n* Health Scanner\r\n\r\n* hatchet\r\n\r\n* Update DefaultPrefabObjects.asset\r\n\r\n* wires and cables item\r\n\r\n* Fix colliders\r\n\r\n* Update SteelRod.prefab\r\n\r\nscale\r\n\r\n* Update SleeperBed.prefab\r\n\r\nfix location","shortMessageHtmlLink":"Add Generic Models 2 (#1405)"}},{"before":"7aa556de6846eed175a2c8172c0768186d9f4d52","after":"f4220e4efc8664e094ced4de680c440158fc8121","ref":"refs/heads/develop","pushedAt":"2023-12-23T01:09:18.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Add generic models (#1386)\n\n* Add Airlock tile\r\n\r\n* Add slot machines and tanks\r\n\r\n* water tank fuel tank slot machine\r\n\r\n* Delete BodyParts.meta\r\n\r\n* Add material items\r\n\r\n* assets for them\r\n\r\n* Glass shard\r\n\r\n* Welder\r\n\r\n* Add tanks\r\n\r\n* Rename floor tile\r\n\r\n* Missing tilemap SOs\r\n\r\n* Update Items.asset\r\n\r\n* Reference Ids\r\n\r\n* Add examine data\r\n\r\n* Fix prefabs and remove casting shadows\r\n\r\n* Add folded jumpsuits\r\n\r\n* addressables and stuff\r\n\r\n* Item SOs\r\n\r\n* Fix clothing shadows\r\n\r\n* this shit\r\n\r\n* Update DefaultPrefabObjects.asset\r\n\r\n* Update Items.asset\r\n\r\n* Update jumpsuits\r\n\r\nMake jumpsuits prefab variants of the grey and add jumpsuit item\r\n\r\n* Rename folder\r\n\r\n* fix welder\r\n\r\n* Update Welder.asset\r\n\r\n* Update AddressableAssetSettings.asset\r\n\r\n* jumpsuit fix?\r\n\r\n* Add missing item reference\r\n\r\n* Update SteelRod.prefab\r\n\r\nfix held rotation\r\n\r\n* Update Items.asset\r\n\r\nadd glass shard\r\n\r\n* add name field and fix held rotation on sodas\r\n\r\n* Add missing tilemap data for some items\r\n\r\n* fix jumpsuit and items asset database\r\n\r\n* Fix airlock missing meshes\r\n\r\n---------\r\n\r\nCo-authored-by: stilnat ","shortMessageHtmlLink":"Add generic models (#1386)"}},{"before":"e2d84821d0b21585cc583741a21a148838ebcb41","after":"7aa556de6846eed175a2c8172c0768186d9f4d52","ref":"refs/heads/develop","pushedAt":"2023-12-16T16:47:31.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Add examine data for items (#1399)\n\n* clothing\r\n\r\n* food\r\n\r\n* func\r\n\r\n* Resolve conflicts","shortMessageHtmlLink":"Add examine data for items (#1399)"}},{"before":"d1a51b31fb18f56a4ebadc3a2d1481ec9351d892","after":"e2d84821d0b21585cc583741a21a148838ebcb41","ref":"refs/heads/develop","pushedAt":"2023-12-16T16:44:46.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"Reimport connectables (#1368)\n\n* Reimport connectable objects\r\n\r\n- Renames DirtTile to DirtRockSandFloors\r\n- Removes WallPanels because they are outdated and backed up on art repo.\r\n\r\n* Fix broken prefabs\r\n\r\n* scripts\r\n\r\nscripts\r\n\r\n* Update Vent&Scrubber.fbx\r\n\r\n* Rotate booth\r\n\r\n* Revert \"scripts\"\r\n\r\nThis reverts commit 6a606470f87daa119ef98b26110d1c0fb4085ab1.\r\n\r\n* Rotate cables\r\n\r\n* Rotate tables and wires\r\n\r\n* Fix advanced connections\r\n\r\n* Rotate carpet and plenums\r\n\r\n* Rotate walls\r\n\r\n* fix plenum\r\n\r\n* Rotate pipes\r\n\r\n* Fix scripts","shortMessageHtmlLink":"Reimport connectables (#1368)"}},{"before":"5a19f64b4e5ec2dd48fd3211c84df058626eae4d","after":"d1a51b31fb18f56a4ebadc3a2d1481ec9351d892","ref":"refs/heads/develop","pushedAt":"2023-12-15T11:08:40.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"furni (#1397)","shortMessageHtmlLink":"furni (#1397)"}},{"before":"7c23959b12ecf884bb477a8dad1fc3adca9b9f34","after":"5a19f64b4e5ec2dd48fd3211c84df058626eae4d","ref":"refs/heads/develop","pushedAt":"2023-12-15T10:30:32.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"stilnat","name":null,"path":"/stilnat","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/14344825?s=80&v=4"},"commit":{"message":"examine (#1398)","shortMessageHtmlLink":"examine (#1398)"}}],"hasNextPage":true,"hasPreviousPage":false,"activityType":"all","actor":null,"timePeriod":"all","sort":"DESC","perPage":30,"cursor":"djE6ks8AAAAEQjp7kQA","startCursor":null,"endCursor":null}},"title":"Activity · RE-SS3D/SS3D"}