Commit Graph

158 Commits

Author SHA1 Message Date
Joonas Rikkonen
ebb62d2fd2 (a432c283e) Fixed popping texture when fixing reactor 2019-04-06 17:47:45 +03:00
Joonas Rikkonen
4238676548 (80a1a0003) Made electrical engineers responsible for operating the reactor. 2019-04-06 17:47:32 +03:00
Joonas Rikkonen
8713b0ba8e (9a1210d72) Fixed not being able to zoom out fully with turrets 2019-04-06 17:47:20 +03:00
Joonas Rikkonen
7e49140920 (9a23cb0c4) New decoy sprite 2019-04-06 17:47:07 +03:00
Joonas Rikkonen
0725e1c4b2 (1d7e76d1f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-06 17:46:55 +03:00
Joonas Rikkonen
f958f5fb44 (248ac43ed) Added inventory icons for Physicorium items armor, helmet, ammunition box and spear + normal and explosive spear (not yet implemented) 2019-04-06 17:46:42 +03:00
Joonas Rikkonen
6fed28e80b (b00ce5ec2) Fixed character's feet levitating when standing at the base of a staircase without climbing it. Closes #1275 2019-04-05 16:21:41 +03:00
Joonas Rikkonen
6199f68999 (3fde2a20d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-05 16:21:26 +03:00
Joonas Rikkonen
a3ff707a31 (cf99ace8a) Fix bots entering the combat state if taking damage from falling etc. 2019-04-05 16:21:12 +03:00
Joonas Rikkonen
69c414dfc9 (34cca982f) Steering tweaks that should fix bots not being able to proceed on ladders when the next waypoint is not on the ladder but the one after that is. 2019-04-05 16:20:58 +03:00
Joonas Rikkonen
11a77e3694 (83dad7f87) Fixed crashing when attempting to use the turrets in character mode in the sub editor 2019-04-05 16:20:42 +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
501a114000 (4119dec1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-05 16:19:55 +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
592683afa8 (4cdc7cef2) Changed Pause Menu quit button to say "Main Menu" as you aren't closing the game when pressing it 2019-04-05 16:19:22 +03:00
Joonas Rikkonen
161f725778 (2b36813ef) Added Back button to submarine editor 2019-04-05 16:19:07 +03:00
Joonas Rikkonen
8f42801c7a (2d473d38a) Add RequireAimToUse checks for being logical and for future. Shouldn't have any functional implications in the current version, but we could have RepairTools or Weapons that don't require aiming. 2019-04-05 16:18:52 +03:00
Joonas Rikkonen
350e6d6036 (5c39920a7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-05 16:18:37 +03:00
Joonas Rikkonen
aef3a96d60 (cb01ae2fe) Small adjustments to Sub Editor entity list 2019-04-05 16:18:23 +03:00
Joonas Rikkonen
f6bf7d9219 (dc09b0993) Fix bots not aiming with the welding tool when trying to repair, because of a dump error when checking the RequireAimToUse property. 2019-04-05 16:18:08 +03:00
Joonas Rikkonen
d259ac40a2 (33511440f) Small tweaks to the Sub Editor screen 2019-04-05 16:17:53 +03:00
Joonas Rikkonen
2e5da818ba (ca275c7a4) Tune Crawler attack (on ground only) so that it applies forces also to torso, which will make her to jump a bit. Rise the torso and head positions and the collider offset from ground a bit. 2019-04-05 16:17:37 +03:00
Joonas Rikkonen
aafb463dcf (2c44bade5) Workshop UI improvements final 2019-04-05 16:17:24 +03:00
Joonas Rikkonen
e3c7b67a5e (82fdb1b93) Higher-res tickbox & radio button sprites 2019-04-05 16:17:09 +03:00
Joonas Rikkonen
f787256dc8 (03383d4e3) Fixed items being impossible to select in character mode in the sub editor when using the legacy control scheme 2019-04-05 16:16:54 +03:00
Joonas Rikkonen
f475c16b71 (802af8fef) Changed workshop items to be ordered by total unique subscriptions rather than trending which is view based 2019-04-05 16:16:40 +03:00
Joonas Rikkonen
5a1f55ade5 (9cf9078c7) Changelog additions 2019-04-05 16:16:26 +03:00
Joonas Rikkonen
2fbd1a1d92 (93746b96f) Workshop menu layout improvements 2019-04-05 16:16:09 +03:00
Joonas Rikkonen
2b1458a89f (6e2d03d7f) Changelog update 2019-04-05 16:15:54 +03:00
Joonas Rikkonen
19b451ff17 (5ddee76aa) Workshop UI improvements #2 2019-04-05 16:15:40 +03:00
Joonas Rikkonen
07c40f317f (52c7231e3) Reparse item messages when key bindings are changed 2019-04-05 16:15:27 +03:00
Joonas Rikkonen
94fe1ba331 (064609500) Fixed nearby items being selected when dragging/selecting/modifying wires in the sub editor. 2019-04-05 16:15:12 +03:00
Joonas Rikkonen
f00b74926b (47f7024a5) Adjusted door/hatch shadow sizes to get them to match the sprite more closely 2019-04-05 16:14:43 +03:00
Joonas Rikkonen
6ac3ecd2b2 (86a1bac17) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-04 11:43:25 +03:00
Joonas Rikkonen
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
Joonas Rikkonen
cc122f2bbf (b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test 2019-04-04 11:10:29 +03:00
Joonas Rikkonen
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
Joonas Rikkonen
41da4e24a9 (cd41ee958) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-04 11:09:45 +03:00
Joonas Rikkonen
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
Joonas Rikkonen
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
Joonas Rikkonen
dce643e116 (a135020e9) Fixed item assembly names and descriptions not being fetched from the text xml 2019-04-04 11:09:03 +03:00
Joonas Rikkonen
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
Joonas Rikkonen
7eb03ea6b3 (874c38a79) Show keybindings for use or shoot in the tooltips. 2019-04-04 11:08:33 +03:00
Joonas Rikkonen
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
Joonas Rikkonen
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
Joonas Rikkonen
79ea41e6c9 (4f4395b00) Reduced the size of the disallowed item interface area around the chatbox 2019-04-04 11:07:45 +03:00
Joonas Rikkonen
860e5204ab (cad2b1306) Fix the camera issue on turrets. 2019-04-04 11:07:29 +03:00
Joonas Rikkonen
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
Joonas Rikkonen
c8a7815ef8 (6ae5f1e59) Sync the new input with the server. 2019-04-04 11:06:59 +03:00