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 7245c721339885d062567befc052a592391b3b4a
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sun Mar 10 15:22:31 2019 +0200
Fixed StatusEffects only applying afflictions to one limb even if the target is "Character" instead of "Limb", added a subtle screen distortion effect to heavy radiation sickness. Closes#1256
commit e0db27e62ec9546fd4b182a0cc97f7e5830645ae
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat Mar 9 21:53:51 2019 +0200
Fixed WrapText adding unnecessary spaces after every line break. Closes#1215
commit 988bc58d51c195ad9265b84a1e97e0101cd3f808
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat Mar 9 21:12:50 2019 +0200
Fixed crashing when attempting to create a body for a wall section that's less than 1 unit long (e.g. if a wall that's just slightly longer than the wall section size receives damage).
commit 8c31157425a9e2ec02312618d1bfa359ab3ee87d
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat Mar 9 20:30:44 2019 +0200
Fixed clients being unable to toggle the respawn shuttle on/off
commit a4ccb039219830efe9cd305c26942dda1bd04e9c
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat Mar 9 19:33:22 2019 +0200
Fixed inability to select the respawn shuttle as a client host
commit b89b2d2c282d8c74d7ccd37b3f29dcab51eff680
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat Mar 9 19:32:41 2019 +0200
Made it possible to edit the style of the ListBox under GUIDropDowns, increased the opacity of the listbox to make the contents more readable when there's text behind it
commit 8f6d9aef3d637fe37a18c78f4b15ef8fd266374e
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat Mar 9 18:11:23 2019 +0200
Fixed NetLobbyScreen not showing the names of the submarines the client doesn't have
commit 18b4bacd5bb645f36f62e77587af971cb789d37c
Author: Daniel Asteljoki <daniel.asteljoki@gmail.com>
Date: Fri Mar 8 13:04:51 2019 +0200
Added a beginner level sub
commit eef09f7d07cde64d1f2f6971eda733505339a0c0
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 19:05:14 2019 +0200
Remove the old sprite when recreating the sprite.
commit a6c3ce00782882bc14f200f95abab0fa4d5d9a2d
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 19:04:51 2019 +0200
Fix gender specific wearables not refreshing when we change the gender.
commit f606b801dac9e4cbb4238506ff4d73981709a2f8
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 18:42:14 2019 +0200
Move some console commands from the shared project to the client. These should not be debug only, because they might be useful for modders too.
commit 154251c183eacf37e92fa7b27bb6d57bb15797d8
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 14:42:22 2019 +0200
Disable latchonto ai for now.
commit bdbcef41bfbc42beeb2d942e7db431b8ab627f1c
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 13:31:02 2019 +0200
Simplify the sprite related commands.
commit 49c8e1cd01953ae31cff99bf35432ab887b45d62
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 13:05:20 2019 +0200
Rename "Reload Texture" button as "Reload Sprite", because it actually reloads both the xml and the texture. Add the button text into the localization file.
commit 84f58d9e0bb46f29412f936d569348e46227c9d5
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 12:50:51 2019 +0200
Add the option to reload xml/texture/both for items when they are hovered over with the mouse. dry.
commit 732084c044e6a2c220cee8d5c1d9b5e4ce05587d
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 12:48:49 2019 +0200
Fix the sprite name of the right hand in the assistant job gear.
commit 30344369d7e87a17312cc839f195c36c77c4a3b2
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 12:26:20 2019 +0200
Fix ReloadXML failing when multiple source elements are found.
commit ddb6fb48b6e0789b18a1ea889dcdf408fcbb5b12
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 11:47:13 2019 +0200
Fix damagemodifier multiplier not applied on particles if no sound is played.
commit 41206013be41d240b12dad48f4ddaba9b072742b
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 11:46:22 2019 +0200
Fix engigear lower arm sprite name.
commit 8ce938305206ca65aeb00515639e799d9f2fd526
Merge: e6166d2ef 61703e8af
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Mar 6 18:53:36 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit e6166d2ef24489bac6f217211849884013dbf4e6
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Mar 6 18:53:30 2019 +0200
Implement husk sprite overlays as wearables. Add new husk injector (wip).
commit 367c4f5b3784c65c3c26807dd6c10e837960c6bb
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Mar 6 18:52:15 2019 +0200
Add console commands for changing the gender and race of the character.
commit 61703e8af274c8f5d9e05575ebaf13c9bde8855f
Author: Iiro Enges <iiro@fakefish.fi>
Date: Wed Mar 6 17:47:09 2019 +0200
Refined environment item scales and colors
commit 5d2c9f2e19d9d876d606415667f56c1f92fd1b8f
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Tue Mar 5 19:35:34 2019 +0200
corrected cases
commit cd9cf4ed3117b9a5cc4cb57428d8dc11d756d274
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Tue Mar 5 19:01:54 2019 +0200
updated settings
commit 84ad07149a8e56d59fd2d71b34fbb92479eba042
Author: Iiro Enges <iiro@fakefish.fi>
Date: Tue Mar 5 18:48:26 2019 +0200
Added an updated title text
commit 0ae68b0857ee259cac1480cb20a9c02f3bb88d8d
Author: Iiro Enges <iiro@fakefish.fi>
Date: Tue Mar 5 18:46:59 2019 +0200
Replaced old alien ruin textures with new ones (more variants to be added)
commit b57a6765f56ea1504ff5b39b14172f73b4122597
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 17:44:46 2019 +0200
Fixed particle jitter caused by a bug in the interpolation logic (was especially noticeable when the sub is moving fast)
commit e6715d605db9bb1d608e4a4990ac41f6214f61d1
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 17:22:31 2019 +0200
Fixed the "control" console command not being usable by clients, changed the way arguments are given to the "setclientcharacter" command (no semicolon to separate the names, quotation marks have to be used for multi-word names just like with any other command). Closes#1224
commit acb7c1e0dc05bf619e7ec4875196cc45647d3fb4
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 16:30:38 2019 +0200
Steam Workshop fixes:
- Install content packages for items that only contain a sub. Otherwise the system can't determine if the item has been updated (and might also be useful for toggling off incompatible subs when switching from mod to another).
- Log an error instead of crashing the game if CheckWorkshopItemEnabled or CheckWorkshopItemUpToDate fails due to a missing filelist.xml.
- Show a messagebox when a workshop item is updated succesfully.
commit b2e8ed565bc03f466930799268c13b2fca4bb9c9
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 14:43:42 2019 +0200
Fixed nullref exception when disabling a workshop item that doesn't have an update button (or when enabling the item fails)
commit 26f1f285cd80ca6f023b12e6dd80dc71e87ee9c3
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 14:15:14 2019 +0200
Fixed console command aliases not being taken into account in GameClient.HasConsoleCommandPermission (meaning that the client needed a permission for each name variant of a command, making it impossible to for example use "fixwalls" instead of "fixhulls"). Closes#1225
commit dee02de681a212efd0e0a82c14619f3fe4839cc4
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 13:35:48 2019 +0200
Fixed traitor rounds failing to start if there's no owner client, fixed occasional "traitorCount somehow ended up less than 1" errors due to Rand.Int using 0 as the minimum value. Closes#1217
commit bbc4a31aa83572258226f303ab767f8546de64fb
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 13:08:38 2019 +0200
Fixed missing item names in the extra cargo menu. Closes#1218
commit dd18bd163e05e8ba4718c0e98083e50ef0a0157e
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 13:04:54 2019 +0200
Fixed a compiler error in RespawnManager
commit 904700eda3e4da5468208bd7553a803e9f41234e
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 12:56:29 2019 +0200
Autorestart/spectating fixes (closes#1219):
- The server owner and spectators don't trigger autorestart.
- The owner is allowed to spectate even if spectating is disallowed in server settings.
- Fixed "play yourself" always toggling to true when a round ends.
commit 9710612256875d5a788fb34371ca8ea6dd61b749
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Tue Mar 5 10:10:25 2019 +0200
dropped the point at which damage sprites appear slightly.
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
Joonas Rikkonen