 Joonas Rikkonen
|
72adf9e4f7
|
(e1251872a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 06:34:36 +03:00 |
|
|
Joonas Rikkonen
|
8bf054ef2a
|
(8e85e4405) updated compartment names
|
2019-05-16 06:34:19 +03:00 |
|
|
Joonas Rikkonen
|
d57f851dc2
|
(a35fe28dc) Use ToLowerInvariant when checking hull names during submarine loading (otherwise it may not work correctly on some locales)
|
2019-05-16 06:34:03 +03:00 |
|
|
Joonas Rikkonen
|
2215c2fba0
|
(b3637fc6c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 06:32:22 +03:00 |
|
|
Joonas Rikkonen
|
9da8a437eb
|
(aebd2c4c0) tweaks part 666
|
2019-05-16 06:32:06 +03:00 |
|
|
Joonas Rikkonen
|
fc22eb5088
|
(fc5e081d3) Fixed: Hull names not saving properly in submarineditor
|
2019-05-16 06:31:32 +03:00 |
|
|
Joonas Rikkonen
|
61f5ccc71d
|
(c93eaea48) Merge branch 'human-ai' into dev
|
2019-05-16 06:14:43 +03:00 |
|
|
Joonas Rikkonen
|
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 |
|
|
Joonas Rikkonen
|
5f524ddd3f
|
(457e4ebe5) Fixed: Submarine navigation labels being translated when loading a sub in editor
|
2019-05-16 06:13:49 +03:00 |
|
|
Joonas Rikkonen
|
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 |
|
|
Joonas Rikkonen
|
c1d1cf442f
|
(9bec1c7ab) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 06:05:33 +03:00 |
|
|
Joonas Rikkonen
|
36ee088738
|
(3fbeb4c70) Option to make items use the name and description of another item
|
2019-05-16 06:05:16 +03:00 |
|
|
Joonas Rikkonen
|
24be77b15e
|
(8d0d7ce53) Fixed: Some rooms not using translations
|
2019-05-16 06:04:40 +03:00 |
|
|
Joonas Rikkonen
|
e4f41789b0
|
(143d158cb) Merge branch 'dev' into human-ai
|
2019-05-16 05:25:02 +03:00 |
|
|
Joonas Rikkonen
|
3d7a113d75
|
(048b753e6) Merge branch 'dev' into human-ai
|
2019-05-16 05:20:29 +03:00 |
|
|
Joonas Rikkonen
|
bec7aadfa9
|
(af16ecdfa) Merge branch 'dev' into human-ai
|
2019-05-16 05:14:00 +03:00 |
|
|
Joonas Rikkonen
|
454dda56c7
|
(1762f02b3) Merge branch 'dev' into human-ai
|
2019-05-16 05:08:22 +03:00 |
|
|
Joonas Rikkonen
|
039d07f693
|
(a2943d8b7) Merge branch 'dev' into human-ai
|
2019-05-16 05:04:10 +03:00 |
|
|
Joonas Rikkonen
|
60f52375e6
|
(7788ec72a) Test issuing orders automatically.
|
2019-05-16 05:03:49 +03:00 |
|
|
Joonas Rikkonen
|
5af8170ac6
|
(372c6e60a) More automatic text scaling + merge fix
|
2019-05-06 14:15:40 +03:00 |
|
|
Joonas Rikkonen
|
8d3a48584b
|
(92fc1380e) Allow interacting with items inside outposts (only prevent deattaching items from walls)
|
2019-05-03 13:48:15 +03:00 |
|
|
Joonas Rikkonen
|
fb21005258
|
(6f4bea467) Updated doors
|
2019-05-03 13:43:47 +03:00 |
|
|
Joonas Rikkonen
|
fbb7daed00
|
(0c3442136) Merge branch 'dev' into docking-interface
|
2019-05-03 13:41:23 +03:00 |
|
|
Joonas Rikkonen
|
2199a0f97f
|
(276dcf6d2) Docking indicator changes color when the docking port is within the sector
|
2019-05-03 13:40:12 +03:00 |
|
|
Joonas Rikkonen
|
b551ae7999
|
(c1468d39d) Overhauled docking interface (WIP)
|
2019-05-03 13:39:54 +03:00 |
|
|
Joonas Rikkonen
|
ad298c69c2
|
(118683d11) Fixed crashing when generating levels in the level editor.
|
2019-04-29 21:13:20 +03:00 |
|
|
Joonas Rikkonen
|
46f5bd5b15
|
(99a5e8cf8) Fix bots not using the ladders when swimming on the water surface. + merge fix
|
2019-04-26 11:29:14 +03:00 |
|
|
Joonas Rikkonen
|
e83dba2959
|
(42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev
|
2019-04-25 18:07:37 +03:00 |
|
|
Joonas Rikkonen
|
f774694154
|
(4246de267) Fixed saving a submarine with a new name causing the previous sub file to disappear from sub lists until saved subs are refreshed, fixed new subs appearing at the end of the list (instead of being sorted alphabetically)
|
2019-04-23 11:17:20 +03:00 |
|
|
Joonas Rikkonen
|
6262b3ea54
|
(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-16 17:12:09 +03:00 |
|
|
Joonas Rikkonen
|
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 |
|
|
Joonas Rikkonen
|
b705b1579c
|
(c12fe7d80) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-15 12:00:49 +03:00 |
|
|
Joonas Rikkonen
|
b4ec36f5bb
|
(2fc72545e) new texts regarding missions and beacons.
|
2019-04-15 12:00:35 +03:00 |
|
|
Joonas Rikkonen
|
4675f969f1
|
(73da2532a) Only repairable items are indestructible in outposts (oxygen tanks, ammo boxes, etc can still deteriorate normally).
|
2019-04-15 11:57:28 +03:00 |
|
|
Joonas Rikkonen
|
dc8b49b5b6
|
(e3f5b70a3) Updated vanilla sub preview images (resolution 1024 x 448-512)
|
2019-04-06 17:52:23 +03:00 |
|
|
Joonas Rikkonen
|
f80e9a29a7
|
(301f0a344) Option to set a custom preview image for subs
|
2019-04-06 17:50:53 +03:00 |
|
|
Joonas Rikkonen
|
c19899769e
|
(cb10b53db) Fixed GUIImage.RecalculateScale throwing an exception if the sprite is not set, use relative scales in GUINumberInput to make the child elements scale dynamically with the parent
|
2019-04-06 17:50:40 +03:00 |
|
|
Joonas Rikkonen
|
7b3ccde624
|
(46f58eedd) Set submarine preview image resolution back to 256x128. For some reason, higher resolutions seem to cause hangs for when loading the image. I suspected it was because of encoding the image as a Base64 string into the xml, but that doesn't seem to case: I tried saving the image as a separate file instead, and it still causes the same problem (see #19 in the private repo).
|
2019-04-06 17:50:27 +03:00 |
|
|
Joonas Rikkonen
|
8d8478432f
|
(00783cc63) Don't premultiply submarine preview image alpha, fixed background texture not covering the whole preview image when using an image resolution larger than the size of the texture
|
2019-04-06 17:50:13 +03:00 |
|
|
Joonas Rikkonen
|
14d0daf16d
|
(ccef21f63) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-06 17:49:31 +03:00 |
|
|
Joonas Rikkonen
|
45c1ed499a
|
(e326112f5) Increased discharge coil sound range and added camera shake to make it more noticeable when it's used
|
2019-04-06 17:49:18 +03:00 |
|
|
Joonas Rikkonen
|
c94f888c4d
|
(5d73de170) Fixed RefreshSavedSub removing an extra sub from the list (causing an index out of range exception if refreshing a sub at the end of the list)
|
2019-04-06 17:48:13 +03:00 |
|
|
Joonas Rikkonen
|
e086af2c6f
|
(bebc37619) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-05 16:20:27 +03:00 |
|
|
Joonas Rikkonen
|
25768d8845
|
(4b54fb4bf) Refactor AIObjectiveCombat and the reactions to the damage. Fixes bots not reacting to any damage done with repair tools. Now they should flee (but not retaliate).
|
2019-04-05 16:20:11 +03:00 |
|
|
Joonas Rikkonen
|
d7364171fb
|
(e31a38ae1) Fixed spritebatch not being disposed when saving submarine preview images, don't reload all subs when saving a sub
|
2019-04-05 16:19:40 +03:00 |
|
|
Joonas Rikkonen
|
7cb70fa344
|
(73193fb71) Updated a couple of sound effects
|
2019-04-01 22:47:36 +03:00 |
|
|
Joonas Rikkonen
|
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 |
|
|
Joonas Rikkonen
|
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 |
|
|
Joonas Rikkonen
|
ddfd7274e9
|
(d5ea3c7d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-29 17:24:17 +02:00 |
|
|
Joonas Rikkonen
|
ca08b803dc
|
(891ef87c3) Fixed: CrewManager throwing errors if changing resolutions when a crewmember is dead. Added: Scaling of the objective list when changing resolutions
|
2019-03-29 17:24:02 +02:00 |
|