PrPleGoo
1b438ca01d
Merge remote-tracking branch 'upstream/master'
2020-04-12 14:33:49 +02:00
Pieter-Jan Briers
dc9f8d551b
Merge pull request #805 from Zumorica/2020-04-09-comms-console-roundend
...
Adds working communications console that ends the round
2020-04-10 17:02:49 +02:00
zumorica
c19035fccc
Use TimeSpan instead of an int for the countdown time
2020-04-10 13:37:13 +02:00
zumorica
05e9d39e89
Fix bug where comms console sometimes took a second to update after a countdown has started
2020-04-10 13:36:30 +02:00
Víctor Aguilera Puerto
47c3258861
Update Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs
...
Co-Authored-By: Pieter-Jan Briers <pieterjan.briers@gmail.com >
2020-04-10 13:28:28 +02:00
Pieter-Jan Briers
aff9f18bc8
Merge pull request #803 from Injazz/bartending
...
Bartending tricks and some revamping on chemistry components
2020-04-10 11:54:40 +02:00
Injazz
503a2a8acf
updates submodule
2020-04-10 12:08:33 +05:00
zumorica
c55a4ffbf4
Countdown is now 4 minutes
2020-04-09 20:31:28 +02:00
zumorica
3c795ad283
Use TimeSpan instead of DateTime in RoundEnd and Comms Console.
2020-04-09 20:28:22 +02:00
Injazz
b73b8cf172
fixes
2020-04-09 20:38:31 +05:00
PrPleGoo
112d9e6d33
Merge remote-tracking branch 'upstream/master'
2020-04-09 17:23:51 +02:00
Pieter-Jan Briers
a6e6edab0e
Update submodule
2020-04-09 16:57:10 +02:00
Injazz
6a08647375
uncomments setter
2020-04-09 16:49:19 +05:00
Injazz
8f580ecc1b
Visually updates contents of the beaker
...
also adds new syringe sprite from eris
also adds colors to ALL reagents
2020-04-09 16:43:56 +05:00
Pieter-Jan Briers
1b065e252d
Merge pull request #799 from Zumorica/2020-03-03-g-g-g-g-g-g-g-g-ghooooosts
...
G-g-g-g-g-g-g-g-ghooooosts!
2020-04-09 11:27:06 +02:00
zumorica
3ba2e5de80
Speech bubbles!
2020-04-09 03:31:40 +02:00
zumorica
5027367988
Add localization to deadchat
2020-04-09 03:08:06 +02:00
zumorica
c0bdfdf123
Remove CanReturnToBody property from SharedGhostComponent
2020-04-09 03:02:21 +02:00
Víctor Aguilera Puerto
612790840c
Update Content.Client/GameObjects/Components/Observer/GhostComponent.cs
...
Co-Authored-By: Pieter-Jan Briers <pieterjan.briers@gmail.com >
2020-04-09 02:59:20 +02:00
zumorica
83e9688133
You can now cancel the timer (recall)
2020-04-09 01:43:28 +02:00
zumorica
64eafde0c3
Adds working communications console that ends the round
2020-04-09 00:28:56 +02:00
PrPleGoo
914d6f0780
Merge remote-tracking branch 'upstream/master'
2020-04-08 16:08:44 +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
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
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
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
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
