Commit graph

26 commits

Author SHA1 Message Date
Vigers Ray
8d0ab85920 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Construction/UI/ConstructionMenuPresenter.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Silicons/Laws/SiliconLawSystem.cs
#	Resources/Locale/en-US/_strings/clothing/components/magboots-component.ftl
#	Resources/Locale/en-US/_strings/singularity/components/generator-component.ftl
#	Resources/Prototypes/Datasets/Names/borer.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
#	Resources/migration.yml
2024-11-20 17:50:33 +03:00
qwerltaz
e98383d572
Construction menu grid view (#32577)
* button

* implement populate grid view

* tweak min width

* Make grid button toggle visible

* tweak min window size

* fix missing recipe button when mirroring item

* make grid buttons toggleable

* align button texture vertically

* selected grid item has plain color background

* tweak window width so all buttons look good

* rename select method, defer colouring

* get icon better

* whoops

* simpler button toggle

* spritesys frame0, move spritesys

* delete old sprite system refs
2024-11-20 12:54:49 +11:00
Rinary
0bd0a4537c
Перевод меню строительства (#179)
* init

* upd.

* more furniture entries

* furniture fully added entries

* lightning.ftl

* machines.ftl

* Merge branch 'ConstructionLocalization' of https://github.com/Rinary1/space-sunrise into pr/179

* materials.ftl

* modular.ftl

* Create utilities.ftl

* Create tools.ftl

* Create structures.ftl

* storage.ftl

* upd storage.ftl

* translate storage.ftl

* translate modular.ftl

* translate materials.ftl

* translate machines.ftl

* translate lighting.ftl

* furniture.ftl translate

* add tiles.ftl

* bots, tools translate

* misc add, translate

* Translate some missing weapons

* some translations

* clothing description

* fun.ftl description

* Steps Translation

* Revert something

* New Steps translatings, Web items translate

* and some new Web translatings

* door staps translate

* NameLocalization

* ooops

* Всё по новой, перевод шагов был дерьмо, теперь materials.ftl

* some new reverts

* фикс?

* apc icon

* some clears

* steps fully translate

* translate

* Locale Search fix

* пу-пу-пу

* ой

* Revert "apc icon"

This reverts commit 65a3eab80453ab758b6a1e1c155d34938f481644.

---------

Co-authored-by: Babaev <babaevyt210@gmail.com>
2024-07-12 04:26:24 +03:00
Artjom
881c2323fd
Favorites tab for the construction menu (#26347)
* Added fovarite button

* Some fixes in xaml

* added some events for favorite recipes

* set methods for presenter

* fixes for  presenter

* added translates

* reset seach when you select any category

* added some margins

* some fixes from compared

* fixed PR notes about arrays

* deleted controls & margins

* did simpleer with arrays

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-06-29 14:10:00 +10:00
Plykiya
d6ba166d3b
Replace obsolete EntityWhitelist IsValid usages (#28465)
* Replace obsolete whitelist is valid with whitelist system

* Consistency

* Fix logic

* Bork

* I figured out how to get whitelists on the client lol

* test fail

* woops

* HELP ME FUNCTIONS

* Fix errors

* simplify

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-01 23:10:24 -04:00
metalgearsloth
4023134cf0
Add UI click sounds (#22410)
* Add UI click sounds

* tweaks

* Significant cleanup

* Audio options and numerous fixes

* Fix the remaining UI elements

* new click sound

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-12-29 15:43:36 +11:00
PixelTK
52af546267
Arachnid 2: Episode 2 (#19984)
* Shield

* minor sprite changes and buffs

* structure buff

* Crafting stuff

* tweaks

* 88-88

* Better web pocket sprites.

* yeah it's fine now.
2023-11-08 12:18:52 -08:00
metalgearsloth
99b77bc2d3
Remove lights compref (#19531) 2023-09-11 19:18:06 +10:00
Leon Friedrich
385b587cfc
Validate prototype ids in c# fields (#18224) 2023-07-30 03:34:51 +10:00
08A
3f93b11e4a
Add shortcut to flip for construction menu (#14152)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-15 14:13:24 +10:00
08A
2d0cd490b7
Fix reset ghost preview when a craft is selected (#14448) 2023-03-06 10:08:53 -08:00
Pieter-Jan Briers
a323671984
Changes for prototype load parallelization (#13066)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-12-20 14:25:34 -08:00
Nemanja
b6135d3be5
Construction warning cleanup (#12256) 2022-10-30 17:48:53 +11:00
Jezithyr
571dd4e6d5
Hud refactor (#7202)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Jezithyr <jmaster9999@gmail.com>
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
2022-10-12 10:16:23 +02:00
Morb
86d7a1fbb9
Fix categories (#10683) 2022-08-18 17:27:46 -07:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
Clyybber
6ac2446d26
Remove some warnings (#5391)
* Remove unused Dependency fields

* Remove noop null check
2021-11-18 16:46:35 -07:00
Vera Aguilera Puerto
5a5006e4cf
ConstructionGL2 Part 2: Better guided steps and recipes. (#5103) 2021-11-02 11:24:32 +01:00
Visne
ac78145b94
Remove encapsulation for previously protected XAML UI fields (#4975) 2021-10-28 14:23:17 +02:00
Vera Aguilera Puerto
189a5c7847
ConstructionGL2 Part 1: ECSification, events and steps. (#5017)
- Completely rewrited the `ConstructionComponent` logic to be ECS, *without* looking too much at the original implementation.
    - The original implementation was dirty and unmaintainable, whereas this new implementation is much cleaner, well-organized and maintainable. I've made sure to leave many comments around, explaining what everything does.
- Construction now has a framework for handling events other than `InteractUsing`.
    - This means that you can now have CGL steps for things other than inserting items, using tools...
- Construction no longer uses `async` everywhere for `DoAfter`s. Instead it uses events.
- Construction event handling occurs in the `ConstructionSystem` update tick, instead of on event handlers.
    - This ensures we can delete/modify entities without worrying about "collection modified while enumerating" exceptions.
    - This also means the construction update tick is where all the fun happens, meaning it'll show up on our metrics and give us an idea of how expensive it is/how much tick time is spent in construction.
- `IGraphCondition` and `IGraphAction` have been refactored to take in `EntityUid`, `IEntityManager`, and to not be async.
- Removes nested steps, as they made maintainability significantly worse, and nothing used them yet.
- This fixes #4892 and fixes #4857

Please note, this leaves many things unchanged, as my idea is to split this into multiple PRs. Some unchanged things:
- Initial construction code is the same. In the future, it'll probably use dummy entities.
- Client-side guided steps are the same. In the future, the server will generate the guided steps and send them to clients as needed, caching these in both the server and client to save cycles and bandwidth.
- No new construction graph steps... Yet! 👀
2021-10-26 16:38:03 +02:00
metalgearsloth
27b50c9485
Sort construction graph recipes alphabetically (#5039) 2021-10-26 16:18:43 +02:00
Vera Aguilera Puerto
a00cc43889 Add missing localization to ConstructionMenuPresenter. 2021-10-08 13:45:32 +02:00
Vera Aguilera Puerto
365c7da4dc
Makes tools and welders ECS, add ToolQualityPrototype. (#4741) 2021-10-07 13:01:27 +02:00
Visne
b7dc3c81ae
Remove redundant #nullable enable (#4275) 2021-07-16 17:37:09 -07:00
Vera Aguilera Puerto
82a2663d1f Fix crafting menu icon not appearing
Fixes #4210
2021-06-20 22:45:00 +02:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects (#4166) 2021-06-09 22:19:39 +02:00
Renamed from Content.Client/Construction/ConstructionMenuPresenter.cs (Browse further)