commit 409d4d96ead69028a164274637d23e350acb73fb
Merge: 95169f539 26e89c63d
Author: EdusFF <pitkanen.eetu@gmail.com>
Date: Mon Mar 11 15:13:27 2019 +0200
Merge branch 'dev' of github.com:Regalis11/Barotrauma into dev
commit 95169f53937f9a7e168a884171eaa21ae7f08023
Author: EdusFF <pitkanen.eetu@gmail.com>
Date: Mon Mar 11 15:13:11 2019 +0200
Modified: ServerMessage structure to allow _ ; in player & submarine names
commit 26e89c63dc8da771aea9f09978a630a6cff60a6f
Merge: b7646d06d fb0b821bc
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 14:42:44 2019 +0200
Merge branch 'kuraiookami-logicExpantion' into dev
# Conflicts:
# Barotrauma/BarotraumaShared/SharedContent.projitems
commit fb0b821bc97891cdeec8f2c740a12119696393ea
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 14:41:21 2019 +0200
Use invariant culture when parsing floats or converting them to strings in signal components
commit f0c8afba934b41358cf5d59a22b87caf33f98a61
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 14:00:44 2019 +0200
Update new signal components to use identifiers & added names and descriptions to the text file, use invariant culture in equalscomponent, memorycomponent doesn't require the signals to be floats
commit 674d9ec804fc4770b602d4b09240b08cafc8ccec
Merge: 3ea33fb54 242e2429f
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 12:01:27 2019 +0200
Merge branch 'logicExpantion' of https://github.com/kuraiookami/Barotrauma into kuraiookami-logicExpantion
# Conflicts:
# Barotrauma/BarotraumaShared/BarotraumaShared.projitems
# Barotrauma/BarotraumaShared/Content/Items/Electricity/poweritems.xml
# Barotrauma/BarotraumaShared/Content/Items/Electricity/signalitems.xml
# Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs
# Barotrauma/BarotraumaShared/Source/Items/Components/Signal/AdderComponent.cs
commit b7646d06d53fb05227276e6286d0e15da5dc9080
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 11:37:33 2019 +0200
Re-enabled multiplayer campaign
commit cf7258f6410a5995c881ec6e95eb9def5cd90ad4
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 11:28:48 2019 +0200
Fixed item interfaces getting repositioned every frame when the editing HUD is open. Closes#1212
commit e8906239c779cf71de694bc65c81058e5cae16ef
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 11:12:05 2019 +0200
Fixed VoipCapture creating new "could not start voice capture" popups constantly if there's no suitable capture device. Closes#1262
commit a30f47fbe47fde4fccb0453c1773a76d730d226b
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sun Mar 10 19:04:59 2019 +0200
Disable audio instead of crashing if no audio device is found. Closes#1214
commit 242e2429fd2c3ed199ac26b55e2cbdc8636e73f9
Author: Darkwolf <Darkwolf0101@gmail.com>
Date: Mon Jan 21 21:26:57 2019 -0600
Expansion of Barotrauma's logic system.
Changed:
- AdderComponent and children can clamp their output
- Powercontainer signals for charge,charge% and charge rate
Added:
- ColorComponent: Dynamic signals for light set_color inputs
- MemoryComponent: Stores and sends a signal that is edge latched
- DivideComponent: Standard division
- MultiplyComponent: Standard multiplication
- SubtractComponent: Standard subtraction
- XorComponent: Exclusive or
- EqualsComponent: Equals comparison
- GreaterComponent: Greater than comparison
commit 2f107db0475bf4b9a8b6f405b9ce8ec489cbc0ba
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Thu Feb 7 16:30:24 2019 +0200
Another nullref fix to the OpenHealthWindow property setter. Closes#1090
commit 1d15d18d2501bedaa1b42ac8e0e7e09e2600960e
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Thu Feb 7 16:19:05 2019 +0200
Fixed crashing when an incompatible content package is selected in config.xml or if the content package cannot be found. Happened because the game attempted to use TextManager.Get before text files had been loaded. Partially fixes#1093
commit 9ec1980fe90bcae65333c188b265ba16a6db6c05
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Thu Feb 7 16:16:53 2019 +0200
added correct effects for alien blood
commit b6d2c56910b5d58477703abc6785ef80719a89a6
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Thu Feb 7 15:41:25 2019 +0200
adjustments to fent, glue and antibiotics
commit 8df16acdaac0a521fe09fb62c6815a46a87f6f25
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Thu Feb 7 15:30:51 2019 +0200
More descriptive ping exception error messages (only shown in debug builds now), some extra checks to prevent using the workshop without steam (although the checks that actually matter are implemented at Steam's side now)
commit 959c503c140196287ab60ec2357feb8bd5c85b18
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Thu Feb 7 14:00:48 2019 +0200
Don't allow severing the joint between a moloch's shell and the "bladder"
commit 0c0b033016c2e82b8cf1b5a4e3f6faa9cde39f40
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Thu Feb 7 13:51:58 2019 +0200
Fixed incorrect item panel positioning in the crew command interface when the sub is docked to something. Closes#1082
commit 68366a4bf3c73b70288f043199d3ab9b2f5f4d06
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Thu Feb 7 13:23:38 2019 +0200
Fixed outdated damage modifiers in security and clown gear (used damage types instead of afflictions), not defining any affliction types for a damage modifier makes it affect all types of damage. Closes#1088
commit 5d3ab5084b8bc5357bc4a53993ad8dfcc44d0412
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Thu Feb 7 13:04:55 2019 +0200
Fixed client-side nullref exception if the round ends while the health window is open. Closes#1090
commit 8249d789a60dfe4bcdd1705d26d6ca36ed407058
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Thu Feb 7 12:48:34 2019 +0200
The dedicated server doesn't initialize a Steam client (not required to use any of the Steam server functionality). Fixes players being unable to log in as a client when they're hosting a dedicated server on another machine. TODO: SteamCMD support
commit 55fb0bb1ba4bb8385dabbf6e40d4651bf86294a9
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Thu Feb 7 12:31:46 2019 +0200
Added linked hulls
commit 937d50dca50d8c889a7c11b55765c208d2d16b67
Merge: 8109ae1a3 57731761f
Author: EdusFF <pitkanen.eetu@gmail.com>
Date: Thu Feb 7 12:16:43 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit 8109ae1a3377910ff9bf066ccac582d879dfb0a4
Author: EdusFF <pitkanen.eetu@gmail.com>
Date: Thu Feb 7 12:16:37 2019 +0200
Fixed: AI not reloading coilgun if an empty box of ammunition is inserted.
commit 57731761f64bb33a4f4e7baa38367cfb7cf1f873
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Feb 7 12:10:59 2019 +0200
Refactor character head customization logic and store the data in a dedicated class. In the net lobby, generate new head when the user presses the right arrow button. Pressing the left arrow will restore the previous head. When the user presses the right arrow after the left arrow, the first head is restored again. So it's effectively (and technically) undo/redo logic.
commit 37577931e2706ce432cee2d48cd55990bc2bab4a
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Feb 7 12:04:49 2019 +0200
Add properties for getting the count of the undo and redo stacks.
commit f226beb05a55749ac961e3a33ac594fdf903fc3b
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 21:15:56 2019 +0200
Fixes to hull linking & displaying them as one hull on the minimap:
- Links between hulls are now saved.
- Simplified grouping logic (just store a list of linked hulls in hulldata).
- Fixed water/oxygen calculations (use the average of the values instead of their sum).
TODO: DRY (there's now duplicate linking logic in Item and Hull), merge the hull sprites on the minimap, maybe automatize the linking?
commit 5dfea1fbb24c5bd91605caf65baaac9aca9cfbbf
Merge: 2ad9b5de4 d06a1557f
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 20:18:31 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit d06a1557ffb85cd32bbb884fadef60b6d9dd27cf
Author: Alex <olimpickusa6@gmail.com>
Date: Wed Feb 6 18:26:40 2019 +0200
Test for connecting hulls task
- Removed instantiating traitor start popup from client-side TraitorManager (instead the client receives the start message from the server).
- GUIMessageBoxes don't leave unnecessary empty space for the header if the header text is empty.
- More hard-coded text removal.
