 Joonas Rikkonen
|
52991e1ded
|
(41a4cf029) Merge
|
2019-04-25 17:50:53 +03:00 |
|
|
Joonas Rikkonen
|
8be51d71bd
|
(444f7d53a) Added: Workaround for macOS not allowing editing the .app bundle, using Library/Barotrauma instead
|
2019-04-25 17:50:35 +03:00 |
|
|
Joonas Rikkonen
|
ae33907727
|
(5bcbaf382) Improved campaign UI store search bar layout
|
2019-04-25 17:48:28 +03:00 |
|
|
Joonas Rikkonen
|
c69ebd8408
|
(35da84ff7) Fixed sub editor sub list filter area flickering on/off
|
2019-04-25 17:47:54 +03:00 |
|
|
Joonas Rikkonen
|
00586d26ce
|
(195c368ea) Fixed search bar layout and position for sub list and sub editor
|
2019-04-25 17:47:35 +03:00 |
|
|
Joonas Rikkonen
|
544cc7ec08
|
(bad1f3738) Added search bars to sub lists in campaign setup UI and sub editor. Closes #1415
|
2019-04-23 15:37:48 +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
|
3ce6551cb2
|
(4965a76d6) Methods for showing the campaign/editor disclaimers
|
2019-04-23 11:16:43 +03:00 |
|
|
Joonas Rikkonen
|
786c37811f
|
(ed3701e5d) Fixed submarine editor previously used list overlapping with entity list when scrollbar is visible
|
2019-04-18 12:02:50 +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
|
dd371c29cc
|
(6844335fb) Fixed incorrect text tag in submarine save dialog
|
2019-04-16 17:10:25 +03:00 |
|
|
Joonas Rikkonen
|
74c0b22b77
|
(c13450762) Added All tab to the sub editor screen entity list
|
2019-04-11 18:22:19 +03:00 |
|
|
Joonas Rikkonen
|
3877c18d0c
|
(c15419d90) Changelog additions + merge fix
|
2019-04-08 19:20:05 +03:00 |
|
|
Joonas Rikkonen
|
71d546ff7f
|
(f36b3a111) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-08 19:17:50 +03:00 |
|
|
Joonas Rikkonen
|
9a829206af
|
(2c264b075) Improve readability (no functional changes).
|
2019-04-08 19:17:06 +03:00 |
|
|
Joonas Rikkonen
|
5d5979c58b
|
(a69e7b9c1) Moved delete button to the top of submarine list in submarine editor load window, to minimize accidental clicks
|
2019-04-08 19:15:54 +03:00 |
|
|
Joonas Rikkonen
|
9594ea67a7
|
(bf037f9b0) Don't allow deleting vanilla subs or subs that are a part of some content package
|
2019-04-08 13:36:58 +03:00 |
|
|
Joonas Rikkonen
|
d15a88c619
|
(3e8bdbb0a) v0.8.9.9 + merge fix
|
2019-04-06 17:54:39 +03:00 |
|
|
Joonas Rikkonen
|
f043ac26f4
|
(5754c8b91) Fixed incorrectly placed gap in Typhon's cargo room
|
2019-04-06 17:52:36 +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
|
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
|
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
|
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
|
aef3a96d60
|
(cb01ae2fe) Small adjustments to Sub Editor entity list
|
2019-04-05 16:18:23 +03:00 |
|
|
Joonas Rikkonen
|
d259ac40a2
|
(33511440f) Small tweaks to the Sub Editor screen
|
2019-04-05 16:17:53 +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
|
7dae8639cc
|
(2c4d0cf44) Fixed memorystream not being disposed when saving a submarine preview image
|
2019-04-05 16:14:26 +03:00 |
|
|
Joonas Rikkonen
|
9e62d2219a
|
(335f60e63) Don't deselect items in the subeditor with "select" key. Use "deselect" instead. Fixes inventories and other interfaces closing when clicking trying to interact with the items inside them.
|
2019-04-05 16:13:41 +03:00 |
|
|
Joonas Rikkonen
|
f91e28c248
|
(5643d05c2) Show wall count in the sub editor, color the item/structure/wall counts orange/red if there's a very high number of them
|
2019-04-05 16:12:57 +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
|
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
|
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 |
|