Commit Graph

107 Commits

Author SHA1 Message Date
Joonas Rikkonen 454dda56c7 (1762f02b3) Merge branch 'dev' into human-ai 2019-05-16 05:08:22 +03:00
Joonas Rikkonen 60f52375e6 (7788ec72a) Test issuing orders automatically. 2019-05-16 05:03:49 +03:00
Joonas Rikkonen 482f3c1f3c (975eacb57) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-07 16:23:16 +03:00
Joonas Rikkonen bb6067df31 (1e5573bea) new outpost 2019-05-07 16:22:58 +03:00
Joonas Rikkonen 02236f65c5 (e6b42e134) Display the "language changed, restart required" message box using the default font for the selected language 2019-05-07 16:21:15 +03:00
Joonas Rikkonen 5af8170ac6 (372c6e60a) More automatic text scaling + merge fix 2019-05-06 14:15:40 +03:00
Joonas Rikkonen 6e152c4575 (c57beb621) Autoscale text in a bunch of places where it's likely to overflow 2019-05-06 14:13:38 +03:00
Joonas Rikkonen 3c1db2e9a7 (c91620d64) Fixed all language options showing "English" if the name of the language is not present in the text files, apply settings when switching language (too easy to just change the language and restart without applying first) 2019-05-06 14:13:22 +03:00
Joonas Rikkonen b7eaffa068 (c3083f3e0) Added google translated Russian & Chinese text files for testing 2019-05-06 11:36:03 +03:00
Joonas Rikkonen f72fd0bf29 (80eb10d43) Option to automatically pause the game when the window loses focus (on by default) 2019-05-06 11:34:17 +03:00
Joonas Rikkonen fb21005258 (6f4bea467) Updated doors 2019-05-03 13:43:47 +03:00
Joonas Rikkonen b551ae7999 (c1468d39d) Overhauled docking interface (WIP) 2019-05-03 13:39:54 +03:00
Joonas Rikkonen aa48f19801 (902225da6) More automatic text scaling in places where texts are likely to overflow 2019-04-29 21:13:51 +03:00
Joonas Rikkonen c285319e13 (d7b405515) Disabled bug report option (cannot add new texts before EA) 2019-04-23 11:21:28 +03:00
Joonas Rikkonen 1e02bf9d36 (450a14ae6) Resolution button is locked on Windows when in borderless windowed. 2019-04-23 11:19:45 +03:00
Joonas Rikkonen a1eaafeb44 (b807790e4) Created a Bug Report button in settings screen, which links the player either to the Barotrauma feedback or Github issue form 2019-04-23 11:18:13 +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 18f49a3fd4 (1d26e9d80) Improved Server List screen layout 2019-04-10 13:28:58 +03:00
Joonas Rikkonen 593d99ec38 (df9b1966f) Added an option to disable directional voice chat. Closes #1414 2019-04-10 13:27:30 +03:00
Joonas Rikkonen 07c40f317f (52c7231e3) Reparse item messages when key bindings are changed 2019-04-05 16:15:27 +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 7c4f8fcb88 (153cbd717) Fix reset button not refreshing the settings frame. Fix a text tag. 2019-04-04 11:11:24 +03:00
Joonas Rikkonen 87592720df (4c3f5c691) Changed default radio keybind to R and creature attack keybind to 3rd mouse button. Radio key is used much more frequently than the attack key, so it makes sense for it to be closer to WASD (+ R for radio is more intuitive). 2019-04-04 11:11:09 +03:00
Joonas Rikkonen 81239418f3 (218b21ab0) Set keybind textboxes to be equal height 2019-04-04 11:10:56 +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 371bcb11c1 (7a980e4e6) Increased the range of docking port sounds and added a subtle camera shake when locking the ports to make it more noticeable when a sub docks. 2019-04-04 11:09:58 +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 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
Joonas Rikkonen 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
Joonas Rikkonen 0fb6896f1c (b56c60044) Updated: Submarine descriptions 2019-04-03 16:29:34 +03:00
Joonas Rikkonen f3d1888c71 (fb4821343) Added descriptions for Dugong, Remora, Venture 2019-04-03 16:29:20 +03:00
Joonas Rikkonen 4e525633bf (575357b4b) Made settings and quit buttons larger 2019-04-03 16:29:06 +03:00
Joonas Rikkonen ea23ff94d2 (cb16eb160) Removed: Unused instruction 2019-04-03 16:28:53 +03:00
Joonas Rikkonen b4e0294b2d (52b28ec91) Removed: Unused objective 2019-04-03 16:28:38 +03:00
Joonas Rikkonen b787157dc7 (ded94593e) Updated: EnglishVanilla with terms regarded as new additions due to translation not starting until now 2019-04-03 16:28:24 +03:00
Joonas Rikkonen 6b38ba8434 (7749cbf6a) Server sends the current facing direction of a character to clients instead of the TargetDirection. Fixes monsters flipping around constantly client-side. + Don't allow clients to make characters flip in EnemyAIController (controlled by the server) 2019-04-03 16:28:10 +03:00
Joonas Rikkonen 311a34da80 (733c6d509) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-03 16:27:56 +03:00
Joonas Rikkonen 095a51f620 (98fa23c8d) Changed alien harpoon and alien shell to physicorium harpoon and shell 2019-04-03 16:27:42 +03:00
Joonas Rikkonen 1a8d4d5562 (98c4c2bac) Added custom colors to sub editor and keybind inputs, some minor tweaks to sub editor layout 2019-04-03 16:27:27 +03:00