Commit Graph

30252 Commits

Author SHA1 Message Date
Injazz
503a2a8acf updates submodule 2020-04-10 12:08:33 +05:00
scuffedjays
3ce50879b7 New struct for basic round end info per player. 2020-04-10 01:37:14 -05:00
PrPleGoo
c18f318b80 MidpointRounding 2020-04-09 21:29:34 +02:00
PrPleGoo
4aa6c5cc69 Extra unit test 2020-04-09 20:43:45 +02:00
PrPleGoo
4e67f09488 Fixed comments
ReagentUnit now implements IComparable and IEquateable.
ReagentUnit now uses double internally.
Added multiplication without shifting for ints.
InvariantCulture for some string things.
Added units tests for Equals and CompareTo.
Added unit tests to Solution that deals with nasty fractionals.
2020-04-09 20:40:59 +02: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
20cb9b92ab Merge branch 'master' into DecimalReagents 2020-04-09 17:24:22 +02: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
scuffedjays
c47368231b Add scrollable player list to round end menu with OOC Usernames. 2020-04-08 23:51:49 -05: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
scuffedjays
febe9aa46c Removed unused. Use Loc instead. 2020-04-08 19:09:02 -05: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
a507a06916 fix compile error 2020-04-08 22:40:43 +02:00
PrPleGoo
92e2552440 ree travis 2020-04-08 22:40:29 +02:00
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