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
5af8170ac6
(372c6e60a) More automatic text scaling + merge fix
2019-05-06 14:15:40 +03:00
8d3a48584b
(92fc1380e) Allow interacting with items inside outposts (only prevent deattaching items from walls)
2019-05-03 13:48:15 +03:00
fb21005258
(6f4bea467) Updated doors
2019-05-03 13:43:47 +03:00
fbb7daed00
(0c3442136) Merge branch 'dev' into docking-interface
2019-05-03 13:41:23 +03:00
2199a0f97f
(276dcf6d2) Docking indicator changes color when the docking port is within the sector
2019-05-03 13:40:12 +03:00
b551ae7999
(c1468d39d) Overhauled docking interface (WIP)
2019-05-03 13:39:54 +03:00
ad298c69c2
(118683d11) Fixed crashing when generating levels in the level editor.
2019-04-29 21:13:20 +03:00
46f5bd5b15
(99a5e8cf8) Fix bots not using the ladders when swimming on the water surface. + merge fix
2019-04-26 11:29:14 +03:00
e83dba2959
(42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev
2019-04-25 18:07:37 +03:00
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
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
b705b1579c
(c12fe7d80) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-15 12:00:49 +03:00
b4ec36f5bb
(2fc72545e) new texts regarding missions and beacons.
2019-04-15 12:00:35 +03:00
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
dc8b49b5b6
(e3f5b70a3) Updated vanilla sub preview images (resolution 1024 x 448-512)
2019-04-06 17:52:23 +03:00
f80e9a29a7
(301f0a344) Option to set a custom preview image for subs
2019-04-06 17:50:53 +03:00
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
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
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
14d0daf16d
(ccef21f63) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-06 17:49:31 +03:00
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
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
e086af2c6f
(bebc37619) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-05 16:20:27 +03:00
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
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
7cb70fa344
(73193fb71) Updated a couple of sound effects
2019-04-01 22:47:36 +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
ddfd7274e9
(d5ea3c7d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-29 17:24:17 +02:00
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
d974a5d72f
(3a98135bd) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-29 17:21:37 +02:00
c0cf060526
(7d7e17231) Implement reversing and make it as an option for attacks. Detach latching with "F" (debug feature).
2019-03-29 17:20:54 +02:00
c76fb32e15
(5bab406f1) Fixed "allowInsideFixture" raycasts not working correctly - checking if the ray is inside the AABB is not enough, we also need to take the shape and rotation of the fixture into account.
2019-03-28 18:12:23 +02:00
7c8f19ee14
(875de4a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-27 20:56:29 +02:00
86d1102f56
(88961a6ea) Fix wrong spelling: Blatter -> Bladder.
2019-03-27 20:56:01 +02:00
6ca760ceda
(93f4e5d57) Allow repair tools to hit structures even if the barrel is inside the structure. Possibly closes #1306
2019-03-27 20:54:40 +02:00
4cb3469c4f
(8f9250974) Fix spritesheet orientation offestting the joint widgets in the wrong direction, which made it a bit difficult to use.
2019-03-27 20:54:00 +02: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
555d91a3d5
(c590657d2) Don't retry decompressing save files or loading sub files if the file doesn't exist
2019-03-26 17:10:06 +02:00
965a378f0e
(5d67aa3f5) Merge remote-tracking branch 'origin/dev' into enemy-ai
2019-03-25 19:50:58 +02:00
fd5d2b86af
(a97ef2847) AI improvements: - Fix steering issues when attacking (yet again): We still have to offset the sim positions. - Fix the steering vector when escaping from the enemy that is inside the sub. - Enemies can now navigate out from the sub, when escaping. - Fix door tag not being used when targeting items. Change the priority boosts considering doors. Should now entirely ignore the outer doors when inside and inner doors when outside. - Change the way enemies react to characters that are not in the same sub. Halve the priority when the character is not in the same hull. Add some boost to the priority when escaping.
2019-03-25 19:50:02 +02:00
19d5ed5d66
(14f26adfa) Take the position of a sub's docking port into account when determining where to place outposts. Humpback's docking port for example is 600 units to the right from the sub's centerpoint, which prevented it from docking in some levels because the left side of the sub hit the wall at the left side of the outpost. Closes #1028
2019-03-25 19:49:48 +02:00
26594e2c6c
(4b33eda28) Merge branch 'dev' into enemy-ai
2019-03-25 19:49:34 +02:00
5ec6a7fba9
(325184804) Fix distance based attacks not registering if they hit a submarine.
2019-03-25 19:49:05 +02:00
c2e8263927
f9e8100...ccacceb
...
commit ccacceb16a184f00ecd384eede64ca9c4fab08a0
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 14:05:59 2019 +0200
NetEntityEventManager checks the length of the event data (and logs an error if it's too long) before checking if there's still room to keep writing events in the packet. Checking the available room first could lead to situations where an excessively large event can't fit to any packet, "soft-locking" the EventManager without any error messages.
commit 5ac8259372aa900adc724aa4da1fd81af41ca195
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 13:41:52 2019 +0200
Don't display disabled limbs on sonar (i.e. severed limbs that have "faded out")
commit 5f84df73ad86be96f3678c450351b3905e7317a4
Merge: b981f1635 dc429d6c4
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 13:41:16 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
commit b981f163575b2bfc9a83b9925c94eca19b9d4554
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 13:36:19 2019 +0200
Multiplayer campaign fixes:
- Server uses a different temp folder to decompress save/sub files into than the clients. Should fix files occasionally getting corrupted and exceptions when trying to read the files when hosting a server from the main executable.
- Some additional debug logging.
- Use the base names of the adjacent locations as level seeds (i.e. "Vorta" instead of "Vorta Outpost"). The levels should not change when the type (and full name) of the location changes.
commit 42c5d18df77fc7acd5873d8e25f20bdd31b1ed76
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 13:31:06 2019 +0200
Don't transfer files through the network when sending them to the owner of the server (i.e. a client hosting directly from the main executable), but simply tell the client where the file is located.
commit dc429d6c450f4893fe29c51d3c830527e587a871
Author: Daniel Asteljoki <daniel.asteljoki@gmail.com >
Date: Mon Mar 25 13:30:26 2019 +0200
Added labels next to periscopes in Humpback and Dugong
commit 789f02a87a2917dd2ae378f136cbe8dd3236c60d
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 13:29:29 2019 +0200
If loading a submarine fails, wait a bit and retry up to 4 times. Fixes loading occasionally failing when running multiple instances of the game from the same directory.
commit be9ea3a58832992b6226917117247e1bf1efeff9
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 11:03:36 2019 +0200
Fixed a bunch of disconnection messages being in an incorrect format & DisconnectUnauthClient not getting the messages from the xml
commit c6f744b4d6b3520720010f5cd4f22a25b42bfc8b
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Mon Mar 25 10:43:10 2019 +0200
Log entity event errors into server logs when verbose logging is enabled
2019-03-25 14:30:00 +02:00
63eb4d64e5
f8b0295...0671290
2019-03-18 23:30:58 +02:00
Joonas Rikkonen