e83dba2959
(42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev
2019-04-25 18:07:37 +03:00
1a3184dbad
(4c452f172) Force reactor IsActive=true when an AI character or a remote player operates it. Previously this was only done in UpdateHUD, so inactive reactors would not become enabled.
2019-04-18 12:04:56 +03:00
fdacc4534b
(c14dcd3d6) Support for multi-target monster missions
2019-04-18 12:03:07 +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
66de47f041
(a83cec9d6) Made room names translatable, added "RoomName." to all room names in EnglishVanilla.xml
2019-04-15 12:06:58 +03:00
d7e41d95af
(bb287fabc) Decreased simple physics distance, sonar now displays characters that are in simple physics mode
2019-04-11 18:28:38 +03:00
9f55da3677
(8d282f4cc) Hide the crew area and the chat box when using a controller (= aiming with a turret or similar item).
2019-04-10 15:13:25 +03:00
6ac3ecd2b2
(86a1bac17) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-04 11:43:25 +03:00
16c558a859
(7c1aa6679) Reset settings frame when controls are reset, added a button for resetting to default controls & tooltips for the control reset buttons, split keybind textboxes into two columns
2019-04-04 11:10:43 +03:00
cc122f2bbf
(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test
2019-04-04 11:10:29 +03:00
b08a31a68f
(33ab1e038) Add buttons for resetting the settings to the defaults and setting the default keybindings. TODO: pressing the buttons should refresh the settings frame instead of closing it.
2019-04-04 11:10:14 +03:00
41da4e24a9
(cd41ee958) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-04 11:09:45 +03:00
1966bcb4ab
(c445db0f5) Lazy load item & structure sprites (loaded automatically when switching to the sub editor or instantiating an item/structure, so should not cause any mid-game freezes).
2019-04-04 11:09:32 +03:00
66fa81bd3d
(23a7169b0) Updated item assemblies to get the items in sync with the current prefabs (see #1363 )
2019-04-04 11:09:17 +03:00
dce643e116
(a135020e9) Fixed item assembly names and descriptions not being fetched from the text xml
2019-04-04 11:09:03 +03:00
a3425a0432
(bb85ea959) Fixed last item not being visible in grid layout groups if it's the only item on the last row
2019-04-04 11:08:49 +03:00
7eb03ea6b3
(874c38a79) Show keybindings for use or shoot in the tooltips.
2019-04-04 11:08:33 +03:00
d4752bb6a0
(9f5c9fbcb) Make sure lazy-loaded sprites load their texture when creating a GUIImage, because the image needs to know the size of the texture to scale itself correctly. Fixes location portraits not being visible in the campaign menu when a location is selected for the first time.
2019-04-04 11:08:18 +03:00
7491b06a5d
(bbd192053) Rebind Select and Use keys. Refactor GameSettings to support legacy bindings, when they are set. That is, if the new "deselect" and "shoot" keys are not defined, but the player config file is found, use the "select" and the "use" keys instead of the defaults.
2019-04-04 11:08:02 +03:00
79ea41e6c9
(4f4395b00) Reduced the size of the disallowed item interface area around the chatbox
2019-04-04 11:07:45 +03:00
860e5204ab
(cad2b1306) Fix the camera issue on turrets.
2019-04-04 11:07:29 +03:00
2d52a8ddf4
(883c460d5) Don't require holding the aim key when using the periscope/controller. Move the RequireAimToUse from Controller component to Item. Change the use and shoot logic accordingly. TODO: fix the camera centering.
2019-04-04 11:07:14 +03:00
c8a7815ef8
(6ae5f1e59) Sync the new input with the server.
2019-04-04 11:06:59 +03:00
3f05035c18
(c4338b107) Disable aiming when interacting with an item other than ladders.
2019-04-04 11:06:44 +03:00
0cd81c6a99
(cdc68f306) Don't select items when aiming.
2019-04-04 11:06:28 +03:00
5f05322fdb
(fdc038d5d) Keymapping and UX test: - Map use to "E" and Select to "Left Mouse". - Introduce a dedicated key for deselecting ("Right Mouse"). - Introduce a dedicated key for shooting ("Left Mouse"). - Define certain objects as shootables, which simply means that they use the "Shoot" key instead of using the "Use" key. This required the least amount of refactoring the existing code. - TODO: don't register the "Select" input when aiming or when an interface is open -> should prevent interacting through UI elements. - TODO: sync the new input types with the server.
2019-04-04 11:06:12 +03:00
2290645bc9
(caa04a08a) Added a search bar to fabricators, made the interface larger and item previews smaller to fit more items in the view, take chatbox into account when preventing item interface overlap. Closes #1305
...
+ merge fix
2019-04-03 16:31:17 +03:00
0ecfc426ff
(45f083a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-03 16:22:12 +03:00
0dd1823eb1
(44a496915) Added: Template for using a video with the Welcome text in the tutorial if needed. Removed: Old spritesheets. Fixed: Bug in fetching crew with certain jobs
2019-04-03 16:21:57 +03:00
8b12f85f48
(b6f451292) Moved crafting recipes from the fabricator xml to the xmls of the items. Makes it possible for modders to add new craftable items without having to modify the fabricators. Closes #1001
2019-04-01 22:51:37 +03:00
c5725dbb62
(d47fee08d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-01 22:49:42 +03:00
3062e4c705
(1a1137b26) Charybdis now also targets the walls. Tweak Charybdis' attacks and priorities. Fix targeting walls for non-aggressiveboarders. Don't double the wall priority.
2019-04-01 22:49:15 +03:00
a0e1ba52eb
(0bd92547e) Show ping direction when adjusting the direction slider even if directional ping is not enabled. Closes #1298
2019-04-01 22:48:47 +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
8668647049
(866621cd8) Display a warning on the status monitor when docked to an outpost ("Docked to X, undock before attempting to maneuver the submarine").
2019-03-31 19:12:13 +03:00
2281035ffa
(05ee3bb5f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-28 18:11:10 +02:00
fde8cc1d6f
(9edcbf86d) Added: More prominent graphics for when a tutorial objective is completed
2019-03-28 18:10:56 +02:00
68a601722c
(34987308f) Fixed reactor warning lights being clickable
2019-03-28 18:10:27 +02:00
86ded4b1d5
(2f573ba39) Fix Hammerhead spritesheet orientation.
2019-03-27 20:54:13 +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
6fd4d14497
(8b8693dbf) Allow editing selected wires in wiring mode, made connection panels a little less transparent. Closes #1329
2019-03-26 17:34:35 +02:00
d60696f895
(a0e195312) Don't allow steering with WASD when a textbox is selected. Closes #1353
2019-03-26 17:34:21 +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
Joonas Rikkonen