Commit Graph

24328 Commits

Author SHA1 Message Date
PrPleGoo 282ee61e99 not so needed afterall 2020-04-08 22:39:59 +02:00
PrPleGoo 66c6a9e3a6 ah yes a much need whitespace 2020-04-08 22:39:46 +02:00
PrPleGoo 9194694085 Fix initialization change 2020-04-08 19:43:16 +02:00
PrPleGoo a484b6fd52 Implementation of ISelfSerialize 2020-04-08 19:07:33 +02:00
PrPleGoo 070ab51754 Merge branch 'master' into DecimalReagents 2020-04-08 16:08:59 +02:00
PrPleGoo 914d6f0780 Merge remote-tracking branch 'upstream/master' 2020-04-08 16:08:44 +02:00
PrPleGoo e7d121b6b0 Update InjectorComponent.cs 2020-04-08 16:08:16 +02:00
Injazz 4174891c87 some fixes
removes unused interface from DrinkComponent
adds capability to fit inside dispensers for TransformableContainer
removes stomach component from character setup dummy
2020-04-08 17:12:00 +05:00
scuffedjays 02f9c5259c Add foundation for Round End Summary Screen.
Adjust GamePreset class, added title alongside description.
2020-04-08 06:07:54 -05:00
Injazz 1b8215ee49 commented out description setter 2020-04-08 16:06:24 +05:00
Injazz d400f77129 Chemistry revamp and bartending features
-Ability to mix drinks to create cocktails with shiny icons
-New Chemistry System which can relay chemistry events to corresponding components
-moved some solution logic from Shared to Server
-fixed some weird stuff with DrinkComponent
2020-04-08 15:53:15 +05:00
PrPleGoo f8b73fdc3b Fix null-state handling for InjectorComponent 2020-04-05 11:45:23 +02:00
PrPleGoo db83789d05 Merge remote-tracking branch 'upstream/master' into DecimalReagents 2020-04-05 11:37:03 +02:00
PrPleGoo 4e0242d47c Replace decimal with ReagentUnit 2020-04-05 11:36:12 +02:00
zumorica a0d114c672 Ghost sprites and a bunch of fixes 2020-04-05 02:29:04 +02:00
zumorica 0902844457 Merge branch 'master' into 2020-03-03-g-g-g-g-g-g-g-g-ghooooosts 2020-04-04 17:17:11 +02:00
Pieter-Jan Briers 45e9be43ef
Content now owns main menu and launcher connecting. 2020-04-04 15:11:28 +02:00
Pieter-Jan Briers 264891ff86
Update submodule. 2020-04-04 15:11:03 +02:00
Pieter-Jan Briers 5edfa2db34
Re-organize style sheets and add StyleSpace. 2020-04-04 15:10:51 +02:00
Pieter-Jan Briers ff36b2dcc7
Re-enable instruments with fallback when MIDI isn't available. 2020-03-30 18:36:58 +02:00
Pieter-Jan Briers ebe5ffe33e
Soundfont is a word. 2020-03-30 18:34:57 +02:00
Pieter-Jan Briers c282f12edf
Update submodule. 2020-03-30 18:34:36 +02:00
Pieter-Jan Briers 270ded77d8
Merge pull request #797 from JiimBob/enitity-testing
Added entity integration testing
2020-03-30 18:27:36 +02:00
Pieter-Jan Briers 43ec392415
Merge pull request #796 from SweptWasTaken/smesfix
Fixed pixel aspect ratio on SMES
2020-03-30 17:44:46 +02:00
Pieter-Jan Briers eb99b3c0fd
Merge pull request #792 from JiimBob/power-checks
Power checks
2020-03-30 17:43:33 +02:00
zumorica d28af07fce Ghost component implements IActionBlocker 2020-03-30 01:18:28 +02:00
zumorica 24c5909c43 Ghosts retain their prior name, before defaulting to username. 2020-03-30 01:16:44 +02:00
zumorica a07c407f2e Deadchat 2020-03-30 01:15:43 +02:00
zumorica aba3b0217e Moving when dead ghosts you 2020-03-30 01:15:23 +02:00
zumorica 16353a89e6 Default interface implementation for IActionBlocker (defaults to true) 2020-03-30 01:15:03 +02:00
zumorica 91f039d2af Merge branch 'master' into 2020-03-03-g-g-g-g-g-g-g-g-ghooooosts 2020-03-28 23:48:00 +01:00
JiimBob bdc76ad494 Added entity integration testing
Added integration test that spawns all non-abstract entities to see if anything breaks.
2020-03-27 00:32:24 -04:00
Swept 3b06ec8126 Fixed pixel aspect ratio on SMES 2020-03-25 23:16:38 -07:00
JiimBob 006d0685ac LatheComponent indentation fix
Corrected indentation for the switch case.
2020-03-25 19:58:59 -04:00
Pieter-Jan Briers 65d1681cb3
Fix error about game.diagonalmovement being registered multiple times. 2020-03-25 22:21:29 +01:00
Pieter-Jan Briers f790eeb34d
RaisePredictiveEvent works.
Needs sequence numbers fixed.
2020-03-25 17:53:50 +01:00
Pieter-Jan Briers 705aeceba6
Need to merge this 2020-03-25 11:16:57 +01:00
Pieter-Jan Briers 42814fcfe7
Update submodule 2020-03-25 08:36:06 +01:00
Pieter-Jan Briers d7f138ef44
Refactor Controls to default to MouseFilterMode.Ignore (#753)
* Refactor Controls to default to MouseFilterMode.Ignore

* Clean up MouseFilterMode.Ignore from Controls

* Refactor ContainerButtons to use a StyleClass for formatting instead of typeof

* Refactor CharacterSetupButton into a ContainerButton

* Update submodule

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-03-25 02:32:53 +01:00
PrPleGoo fa27e44fd4
Sets drawdepth "Mobs" on the Human prototype (#788)
* Update .gitignore

* Revert "Update .gitignore"

This reverts commit bea34f7f34.

* human entities now get their DrawDepth set to Mobs
2020-03-25 02:28:37 +01:00
Pieter-Jan Briers 957370a832
Merge branch 'master' into RefactorMouseFilterMode 2020-03-25 02:27:28 +01:00
Pieter-Jan Briers 8d1a019b86
Update submodule. 2020-03-25 02:24:40 +01:00
JiimBob 5536ef2d2b Update CargoConsoleComponent.cs 2020-03-22 19:34:38 -04:00
JiimBob d645b1470e Added power checks
Added power checks to:
Reagent Dispenser
Medical Scanner
Lathes
Research Console
Vending Machines

Added power device component to:
chem dispenser prototype
medical scanner prototype

Fixes for #706
2020-03-21 15:37:22 -04:00
PrPleGoo 539214b1ad Some more int -> decimal conversions. Changed the use of the Solution constructor. 2020-03-21 16:22:35 +01:00
Decappi a1357a1ff3
#391 Done Lathe animations (#774)
* Draft PR, do not merge

* Lathe now uses animations. Timing is still wrong, code is very wet, repetitions and unused layers are there.

* Removed (unneeded?) PowerDeviceVisualizer from the lathe
Refactored & Renamed code and variables
Renamed animation names

* WIP protolathe animation

* Working protolathe animation.
I still don't like the solution though.
2020-03-15 17:55:20 +01:00
PrPleGoo 020c74a9cb
Changed Item_Base CollisionMask to 0 (#785) 2020-03-15 10:46:09 +01:00
PrPleGoo dc66621804 Replaced static Rounders with an impleneted interface 2020-03-14 14:04:08 +01:00
PrPleGoo f05fdfb5fc Changed all int and some float things in Reagent code to Decimals 2020-03-14 12:55:07 +01:00
ShadowCommander 8174fdd54b Update submodule 2020-03-10 19:42:55 -07:00