 Joonas Rikkonen
|
87a0ee21eb
|
(6e187d247) Fixed contained items' status effects being added twice to the list of an ItemContainer's active status effects when swapping items. For example, when swapping a fuel rod with another one, the status effect that increases AvailableFuel would be applied twice, causing the reactor to act as if there were 2 rods in it. Closes #1643 + merge fix
|
2019-06-15 20:24:01 +03:00 |
|
|
Joonas Rikkonen
|
3edae38d05
|
(f26b88b8c) Ignore revision number (the last digit of the version number) when determining client/server compatibility. Allows us to release hotfixes etc with a different version number without breaking compatibility. Also incremented version number to make the next version incompatible with older ones.
|
2019-06-15 20:17:15 +03:00 |
|
|
Joonas Rikkonen
|
157f6cfd21
|
(62b9ca04f) Removed Berilia from the build
|
2019-06-15 20:00:44 +03:00 |
|
|
Joonas Rikkonen
|
4b6a753947
|
(f2b1c4b73) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev
|
2019-06-15 19:45:32 +03:00 |
|
|
Joonas Rikkonen
|
b64d3d17ac
|
(ee4193544) Modified: Reduced the health interface opening range mildly to prevent ragdoll flailing at or close to old max range
|
2019-06-15 19:45:11 +03:00 |
|
|
Joonas Rikkonen
|
6c72136fa9
|
(fd30b1df7) Added some workshop item tags
|
2019-06-15 19:44:53 +03:00 |
|
|
Joonas Rikkonen
|
03a7093486
|
(1c5ce3fee) More descriptive error messages when publishing a Workshop item fails.
|
2019-06-15 19:44:13 +03:00 |
|
|
Joonas Rikkonen
|
63999fc17b
|
(62b9ca04f) Removed Berilia from the build
|
2019-06-15 19:43:32 +03:00 |
|
|
Joonas Rikkonen
|
adab8589da
|
(f87bfac85) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-06-12 16:45:24 +03:00 |
|
|
Joonas Rikkonen
|
dce98349ea
|
(23df6915f) Added: Possibility of having a status effect trigger if a requiredItem is missing
|
2019-06-12 16:45:02 +03:00 |
|
|
Joonas Rikkonen
|
e3ca616fff
|
(869ac975f) Merge branch 'master' into dev
|
2019-06-12 16:43:56 +03:00 |
|
|
Joonas Rikkonen
|
eaf4f6afb8
|
(face37755) Fixed clients timing out when trying to connect to a server that has banned someone. Closes #1568
|
2019-06-12 16:43:34 +03:00 |
|
|
Joonas Rikkonen
|
cd5f8735e7
|
(d2accb97f) Restrict server name length to 60 characters, prevent long server names from overflowing in the "host server" menu & server lobby
|
2019-06-12 16:42:33 +03:00 |
|
|
Joonas Rikkonen
|
cf7c0533fe
|
(46cd6704b) Add some extra null checks trying to blind fix #1529.
|
2019-06-11 21:49:07 +03:00 |
|
|
Joonas Rikkonen
|
b14abc0cb0
|
(684b4ac74) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-06-11 21:48:29 +03:00 |
|
|
Joonas Rikkonen
|
d8e7c79a21
|
(74c45abbe) Fixed: GUIDropdown parent returning a null GUIComponent when opening CharacterEditor & promptly crashing after
|
2019-06-11 21:48:10 +03:00 |
|
|
Joonas Rikkonen
|
3b936e41ba
|
(d49897af2) Removed debug code I used to test the position of the workshop item update button
|
2019-06-11 21:47:18 +03:00 |
|
|
Joonas Rikkonen
|
e9c8103be4
|
(5a6865d0f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-06-11 21:46:57 +03:00 |
|
|
Joonas Rikkonen
|
c30f1de8f3
|
(8814bcb6b) Null checks on GUIStyle fonts
|
2019-06-11 21:46:39 +03:00 |
|
|
Joonas Rikkonen
|
5f497543a4
|
(1986bc0d3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-06-11 21:46:21 +03:00 |
|
|
Joonas Rikkonen
|
dd1ce8bf2f
|
(df244251c) Fixed: Electric devices that are underwater and are broken by flooding being repairable forever, due to condition never staying at full condition for long enough for the repairing to stop
|
2019-06-11 21:46:02 +03:00 |
|
|
Joonas Rikkonen
|
a841f75ea0
|
(6e52daaaa) Fixed workshop item "update" button overlapping with the other elements, made the workshop menu larger, fixed incorrect filename in one of the workshop tooltips
|
2019-06-11 21:45:22 +03:00 |
|
|
Joonas Rikkonen
|
7dfa6e89fe
|
(ffa166343) Workshop fixes: - Refresh content package file in the staging folder when adding/removing files, not just when publishing. - Allow multiselecting files in the "add files" dialog. - Fixed autoupdating workshop files not working because Workshop.GetItem doesn't query the time the item was modified. - Some extra exception handling.
|
2019-06-11 21:45:01 +03:00 |
|
|
Joonas Rikkonen
|
a4875cfeb3
|
(776291eb7) Create linked gaps when the door is selected. Move the gaps with the doors.
|
2019-06-11 21:44:32 +03:00 |
|
|
Joonas Rikkonen
|
b8bca945bb
|
(a75fe2e5e) Added: OSX hack for some Macs having a distorted Main Menu on launch
|
2019-06-11 21:44:08 +03:00 |
|
|
Joonas Rikkonen
|
3e68a63a9d
|
(02937a371) Fixed server list height not being updated when filtering servers
|
2019-06-09 17:45:14 +03:00 |
|
|
Joonas Rikkonen
|
b1ee229170
|
(6c5225d9e) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev
|
2019-06-09 17:39:50 +03:00 |
|
|
Joonas Rikkonen
|
6dc3e64bf5
|
(fba51acd3) Fixed: Mechanic tutorial getting stuck if repairing the broken pump before the leaks are repaired
|
2019-06-09 17:39:32 +03:00 |
|
|
Joonas Rikkonen
|
45e05f7c4b
|
(0fe4c8adb) Fixed server ignoring the max players value set in the "host server" menu
|
2019-06-09 17:39:14 +03:00 |
|
|
Joonas Rikkonen
|
a70319bbd2
|
(97e5bb5d1) Don't show the "kick / vote to kick" buttons when inspecting the owner of the server, or display the "x voted to kick" message if someone tries to vote kick the owner.
|
2019-06-09 17:38:20 +03:00 |
|
|
Joonas Rikkonen
|
c4584f7763
|
(d5505ed3d) Show the name of the server in the "connecting to..." popup instead of the IP address
|
2019-06-04 16:52:07 +03:00 |
|
|
Joonas Rikkonen
|
2b7649bd2b
|
(44694344e) Don't allow deleting vanilla subs in the sub editor
|
2019-06-04 16:44:10 +03:00 |
|
|
Joonas Rikkonen
|
43dcc98b8e
|
(9adead624) Add source rect nudging in the sprite editor (move the source rect position with the arrows).
|
2019-06-04 16:43:52 +03:00 |
|
|
Joonas Rikkonen
|
bea7b58ff3
|
(a410fd46c) Trying to help the merge script through a jungle of merges
|
2019-06-04 16:37:31 +03:00 |
|
|
Joonas Rikkonen
|
babc87903b
|
(f9330e2e0) Modified: MacOS to use the same monokickstart when launching server
|
2019-06-04 16:03:35 +03:00 |
|
|
Joonas Rikkonen
|
8184f0e6f6
|
(6b3ca1aae) Fixed the "item in use by x" text not being visible in item interfaces
|
2019-06-04 16:03:00 +03:00 |
|
|
Joonas Rikkonen
|
aaa945ded8
|
(0f1d327f0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-06-04 16:02:42 +03:00 |
|
|
Joonas Rikkonen
|
81dd2f3202
|
(0c86b4b28) Revert "Don't reset the los if there is no client (single player). Fixes los resetting between game sessions (less tedious debugging)."
|
2019-06-04 16:02:25 +03:00 |
|
|
Joonas Rikkonen
|
12ad53297d
|
(657674526) Reallow changing resolution in fullscreen/borderless. TODO: test, disable in borderless because it seems to do nothing?
|
2019-06-04 16:00:57 +03:00 |
|
|
Joonas Rikkonen
|
edccfe223d
|
(9a7d83a40) Fullscreen bug workarounds
|
2019-06-04 16:00:38 +03:00 |
|
|
Joonas Rikkonen
|
012b10d0dc
|
(a487baf88) Fixed: Formatting
|
2019-06-04 15:39:07 +03:00 |
|
|
Joonas Rikkonen
|
e592c49fa8
|
(221f9f2a6) Merge branch 'dev' into capitalizationfixes
|
2019-06-04 15:38:31 +03:00 |
|
|
Joonas Rikkonen
|
f797235bfd
|
(38d8117f7) Added: More routing of TextManager.Get().Replace -> TextManager.GetWithVariable(s), missing workshop-related localization tags to englishvanilla
|
2019-06-04 15:38:12 +03:00 |
|
|
Joonas Rikkonen
|
1a011971d0
|
(49ace9e7f) Removed unused field from CreditsPlayer
|
2019-06-04 15:36:03 +03:00 |
|
|
Joonas Rikkonen
|
bc566ac0e7
|
(bc44f3622) Fixed credits not resizing when resolution is changed
|
2019-06-04 15:32:04 +03:00 |
|
|
Joonas Rikkonen
|
93e4767fb8
|
(657674526) Reallow changing resolution in fullscreen/borderless. TODO: test, disable in borderless because it seems to do nothing?
|
2019-06-04 15:30:32 +03:00 |
|
|
Joonas Rikkonen
|
bce99f2e6f
|
(7e0adb991) Fixed legacy items failing to load if a sub is saved with a language other than English and the language then changed to something else.
|
2019-06-04 15:29:55 +03:00 |
|
|
Joonas Rikkonen
|
ebd916e95c
|
(9a7d83a40) Fullscreen bug workarounds
|
2019-06-04 15:29:36 +03:00 |
|
|
Joonas Rikkonen
|
304db988b1
|
(b63c9bf0c) Fixed OpenFileDialog not closing on Linux
|
2019-05-23 17:04:30 +03:00 |
|
|
Joonas Rikkonen
|
950425174d
|
(7aea3c20b) Fixed subs with the HideInMenus tag being hidden in debug builds but not in release builds (instead of the other way around)
|
2019-05-23 15:15:30 +03:00 |
|