adab8589da
(f87bfac85) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-06-12 16:45:24 +03:00
dce98349ea
(23df6915f) Added: Possibility of having a status effect trigger if a requiredItem is missing
2019-06-12 16:45:02 +03:00
e3ca616fff
(869ac975f) Merge branch 'master' into dev
2019-06-12 16:43:56 +03:00
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
cf7c0533fe
(46cd6704b) Add some extra null checks trying to blind fix #1529 .
2019-06-11 21:49:07 +03:00
bea7b58ff3
(a410fd46c) Trying to help the merge script through a jungle of merges
2019-06-04 16:37:31 +03:00
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
edccfe223d
(9a7d83a40) Fullscreen bug workarounds
2019-06-04 16:00:38 +03:00
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
7c67b1f164
(57c46943d) Quick fix watchman graphics (not quite right yet, but better). Re-enable the variant 2.
2019-05-20 21:00:11 +03:00
b71adc7589
(2e0e45e1f) Updated: Localization
2019-05-20 20:46:21 +03:00
dfa584c2c5
(0b650589c) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev
2019-05-18 21:51:29 +03:00
50f379086c
(3b88adb46) Added: Highlighting to player health bar before the health interface has been opened for the first time
2019-05-18 21:51:12 +03:00
1dc6dc861e
(3d6f5e573) Improved text positioning in the campaign UI crew/store/repair buttons
2019-05-18 21:50:54 +03:00
531c572216
(f6f86c3b6) Use relative scales in store UI, gave more space to the amount input box
2019-05-16 07:00:14 +03:00
61f5ccc71d
(c93eaea48) Merge branch 'human-ai' into dev
2019-05-16 06:14:43 +03:00
9c964b7843
(7d7010579) Fix ai dialog about not being able to find targets. Use a higher thershold for rescue objectives when it's an order.
2019-05-16 06:14:25 +03:00
5f524ddd3f
(457e4ebe5) Fixed: Submarine navigation labels being translated when loading a sub in editor
2019-05-16 06:13:49 +03:00
ce7b9c4f52
(94ad97066) Refactor combat objective. The bots should now be able to reload and seek more ammunition. When they run out of ammunition, they first try to use another weapon and only if no other weapon is found, they seek more ammunition. Had to change the contain item and get item objectives a bit. Hopefully doesn't break things too much.
2019-05-16 06:13:15 +03:00
c73fe6e132
(277003233) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-05-16 06:04:08 +03:00
f259748910
(aebb26541) Added localizable connection names to all items (TODO: display in the connection panel interface, load from prefab if the value is not present in a sub or ItemAssembly file)
2019-05-16 06:03:51 +03:00
a469dad251
(4b8a3151a) Replaced: Untranslated editor line 'FilterMapEntities' with the translated 'serverlog.filter'
2019-05-16 06:03:17 +03:00
3d7a113d75
(048b753e6) Merge branch 'dev' into human-ai
2019-05-16 05:20:29 +03:00
bec7aadfa9
(af16ecdfa) Merge branch 'dev' into human-ai
2019-05-16 05:14:00 +03:00
454dda56c7
(1762f02b3) Merge branch 'dev' into human-ai
2019-05-16 05:08:22 +03:00
d0795791e7
(3bb9485ad) Add automatic orders as objectives instead of orders so that we can take advantage of the existing priority system. Turn the priority values defined in the xml into modifiers.
2019-05-16 05:04:53 +03:00
5def53f7bd
(2972c6da9) Add a missing text.
2019-05-16 05:04:29 +03:00
039d07f693
(a2943d8b7) Merge branch 'dev' into human-ai
2019-05-16 05:04:10 +03:00
60f52375e6
(7788ec72a) Test issuing orders automatically.
2019-05-16 05:03:49 +03:00
fb21005258
(6f4bea467) Updated doors
2019-05-03 13:43:47 +03:00
b551ae7999
(c1468d39d) Overhauled docking interface (WIP)
2019-05-03 13:39:54 +03:00
8737a0e0dd
(26639256a) - Added a method that automatically sets the text scale of a set of GUITextBlocks so that they all use the same scale and the text fits in all of the blocks. - Fixed TextBlock padding not being taken into account if the text is centered. - AutoScale and change the layout in a bunch of places where translated texts are likely to not fit.
2019-04-29 21:12:47 +03:00
52991e1ded
(41a4cf029) Merge
2019-04-25 17:50:53 +03:00
8be51d71bd
(444f7d53a) Added: Workaround for macOS not allowing editing the .app bundle, using Library/Barotrauma instead
2019-04-25 17:50:35 +03:00
ae33907727
(5bcbaf382) Improved campaign UI store search bar layout
2019-04-25 17:48:28 +03:00
544cc7ec08
(bad1f3738) Added search bars to sub lists in campaign setup UI and sub editor. Closes #1415
2019-04-23 15:37:48 +03:00
aa0466ad5b
(67dca1bf6) Added a search bar to the store menu. Closes #1232
2019-04-23 11:21:46 +03:00
8c8f03ae25
(a6f17618b) Allow canceling repairs in the campaign menu, fixed credits not being displayed in the repair tab
2019-04-17 12:43:11 +03:00
6262b3ea54
(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-16 17:12:09 +03:00
bd07acf26d
(052ab6307) Use MonoKickstart on Linux so installing Mono is not required, fixed division by zero if the width of the server console window is 0
2019-04-16 17:11:49 +03:00
fcdfee6328
(333e0a646) Added automatic hull & item repair option to the campaign. TODO: adjust costs, now both options cost a fixed 500 credits. Closes #1314
2019-04-15 11:55:49 +03:00
2eaf22683d
(ae643deeb) Added alive checks to a couple of diving gear status effects (don't consume tanks when dead)
2019-04-01 22:47:22 +03:00
ec7e23061b
(38b5d9aad) Experimental changes to syncing ragdolled (unconscious/dead) characters: - Higher error tolerance when syncing the positions. It's often hard to get the main limb exactly to the same position as the collider, because the positions of the limbs aren't synced and the pose of the ragdoll may differ between the server and clients. Increasing the tolerance makes it less likely for dead/unconscious characters to "twitch" when the game attempts to force the main limb to the position of the collider. - If the position of the ragdoll differs from the position of the collider so much that CheckDistFromCollider disables limb collisions, apply an additional force to all limbs to force the ragdoll to the correct position. Otherwise the ragdoll can occasionally start "hanging" midair, clipping through solid objects, because the main limb's pull joint doesn't necessarily have enough force to pull the entire ragdoll up to the collider.
2019-04-01 22:47:03 +03:00
080ac78ded
(5c35a640e) Update tutorial-rework with dev
2019-03-27 20:52:47 +02:00
3f82c9a2cb
(f417b026f) Fetched: Changes for playing video tutorial from local branch
2019-03-27 20:45:14 +02:00
4b3e78b566
(913ed2ce9) Merge remote-tracking branch 'origin/dev' into enemy-ai
2019-03-26 14:07:11 +02:00
14832e2040
(aea5053bf) Fix wall target position not updated when the submarine moves. Fix latchontoai attach positions and distance checks. Detaching should also work both when the characters can get in and when the submarine velocity is enough to detach the characters. Still not synced, but re-enabled for testing.
2019-03-26 14:06:55 +02:00
d98f0efd66
(0cd6089c2) Disable campaign start button if a round is already running when joining.
2019-03-25 19:51:54 +02:00
cc9ae260a3
58005a8...01f115d
...
commit 01f115d32d768c76d01bc5fad5cfe2e3f88333cc
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Thu Mar 21 13:09:32 2019 +0200
MidRoundSyncing changes (could potentially fix #1281 and #1323 ):
- Don't mark events as "sent to all" if there's a midround syncing client who'll need those events once the midround sync is done.
- Don't keep updating midround syncing clients' unreceived event count as new unique events are created during midround sync, but instead just send the clients the unique events they were missing at the time of joining. Because the new events created during the midround syncing aren't removed anymore, the joining client will be able to receive them when they switch to normal sync. The old behaviour might've lead to cases where the client can't "catch up" with the new events while midround syncing, causing them to time out.
commit 915aeb4e322ad04968556484aea74cf8b0070c3e
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Thu Mar 21 12:16:57 2019 +0200
Fixed end round vote count overlapping with the server log button, display the votes as votes/max instead of y/n.
commit 62e3b272bb0235553562578493bf638a047235ab
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Wed Mar 20 23:36:03 2019 +0200
Updated handheld sonar UI graphics & moved it to the bottom left corner of the screen
commit b93c7312c6bf4b560c8259e79650dbf1444072c9
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Wed Mar 20 23:10:08 2019 +0200
Hide the start button from the campaign UI if the client doesn't have the permission to manage the campaign or rounds.
2019-03-21 14:52:00 +02:00
23687fbf2f
aeafa16...4d3cf73
2019-03-18 22:57:05 +02:00
Joonas Rikkonen