Commit graph

21 commits

Author SHA1 Message Date
Morbo
6343d1e1f8 Merge remote-tracking branch 'upstream/master' into master-syndie
# Conflicts:
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json
2022-12-20 14:15:13 +03:00
TemporalOroboros
9a72b05a50
Splits the singularity into its component parts + ECS singularity + Support for singularities in containers. (#12132)
* InitialCommit (Broken)

* Fixes compile errors

* PR comments. More doc comments. Fixes

* Makes a singularity/event horizon without radiation/physics a valid state to be in

* VV 'fake' setters, fixes the visualizer, fixes the singularity trying to eat itself instead of nearby things.

* Removes unused dependency from Content.Client.GravityWellSystem

* Testing containment and fake VV setters for SingularityGeneratorComponent

* Fixes gravity wells (broken due to LookupFlags.None). Adds recursive Event Horizon consumption

* Fix merge skew

* Fixes for the master merge

* Fix engine commit

* Dirty is obsolete

* Switch over dirty

* Fix requested changes

* ambiant -> ambient

* Moves EventHorionComponent to Shared

* Proper container handling

* Fixes master merge. Fixes post insertion assertions for singularities. Extends proper container handling to gravity wells and the distortion shader.

* Better support for admemes throwing singularities.

* Moves update timing from accumulators to target times

* Update doc comments
2022-12-19 20:47:15 -06:00
Morb
6ad4a10b29
Repository cleanup (#631) 2022-12-10 12:10:27 -08:00
Morbo
6b74e70360 Merge remote-tracking branch 'upstream/master' into test2
# Conflicts:
#	Resources/Maps/infiltrator.yml
#	Resources/Textures/Tiles/attributions.yml
2022-08-16 00:21:46 +03:00
Visne
58769634c7
Fix a bunch of compiler warnings (#10518) 2022-08-13 22:28:34 -07:00
Morber
61951a84f1
[Resprite] Singularity stuff (#320)
* Update containment field sprite

* Update 1 level singularity sprite

* Update 3 level singularity sprite

* Fix sprite sizes

* Fix sprite state name

* Update 4 level singularity sprite

* Fix sprite size

* Update 5 level singularity sprite

* Update level 6 singularity sprite

* Remove 6 level sprite of singularity

* Remove 6 level meta.json

* Add level 6 singularity custom sprite

* Update containment generator sprites

* Remake emitter with new sprites

* Update collector sprites

* New emitter sprite files

* Update level 6 singularity sprite

* Update license singularity level 6

* Decrease singularity to 20 fps
2022-07-26 20:56:02 +03:00
Leon Friedrich
ca7960382b
Missing nullables (#8634) 2022-06-04 17:17:48 +10:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
Vera Aguilera Puerto
2699540526 Remove useless resolves from a buncha tests. 2021-12-08 12:46:30 +01:00
metalgearsloth
8af335097f More (IComponent) shenanigans and also some contaminated IoCManager.Resolve<IEntityManager>() very long yes calls 2021-12-07 22:22:34 +11:00
DrSmugleaf
2a3b7d809d Fix 3000 errors 2021-12-05 18:09:01 +01:00
Vera Aguilera Puerto
f386b57148 Inline OwnerUid 2021-12-03 16:30:34 +01:00
Vera Aguilera Puerto
5cd42c9ad6 Inline UID 2021-12-03 15:53:09 +01:00
Vera Aguilera Puerto
61be228ad0 Some manual GetComponentOrNull inlines 2021-12-03 15:18:15 +01:00
Vera Aguilera Puerto
0feebbff00 Inline HasComponent entirely 2021-12-03 12:23:18 +01:00
Vera Aguilera Puerto
f64df117be Inline AddComponent 2021-12-03 11:33:40 +01:00
Acruid
fa0ec5cbd9
AppearanceComponent API Changes (#5446) 2021-11-23 18:22:59 +11:00
Leon Friedrich
5dd73ff6e0
Fix emitter lock toggle (#5066) 2021-10-28 13:29:19 +02:00
metalgearsloth
f472bbab88
Singularity fixes (#4383)
* Singularity fixes

* Fix the rest

* Woops

* ahh

* Nerf singulo for now

* Final touchups for now

* Review
2021-08-23 00:54:03 +10:00
Swept
5f9ba812ca
Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects (#4166) 2021-06-09 22:19:39 +02:00