Joonas Rikkonen
|
ddd84a4f9e
|
(c45394988) Refactor and fix button interaction and access checks in the indoors steering manager.
|
2019-05-16 05:40:00 +03:00 |
|
Joonas Rikkonen
|
3575c8df52
|
(03ab09991) Load chinese fonts dynamically, removed unnecessary duplicate block from DynamicRenderAtlas
|
2019-05-16 05:39:25 +03:00 |
|
Joonas Rikkonen
|
e367f900b8
|
(2a4bd39c2) Merge branch 'dev' into human-ai
|
2019-05-16 05:33:13 +03:00 |
|
Joonas Rikkonen
|
3d7a113d75
|
(048b753e6) Merge branch 'dev' into human-ai
|
2019-05-16 05:20:29 +03:00 |
|
Joonas Rikkonen
|
b02565796a
|
(98f1dbf5e) Merge branch 'dev' into human-ai
|
2019-05-16 05:14:58 +03:00 |
|
Joonas Rikkonen
|
7f72f72ca7
|
(9c0250ef1) Merge branch 'dev' into human-ai
|
2019-05-16 05:14:40 +03:00 |
|
Joonas Rikkonen
|
bec7aadfa9
|
(af16ecdfa) Merge branch 'dev' into human-ai
|
2019-05-16 05:14:00 +03:00 |
|
Joonas Rikkonen
|
60f52375e6
|
(7788ec72a) Test issuing orders automatically.
|
2019-05-16 05:03:49 +03:00 |
|
Joonas Rikkonen
|
b83302408f
|
(909dcf05d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-07 18:05:33 +03:00 |
|
Joonas Rikkonen
|
427526aba2
|
(d4a475f03) Added text wrapping to pump GUI texts
|
2019-05-07 18:05:16 +03:00 |
|
Joonas Rikkonen
|
56015c2f01
|
(d2cb979c9) Added: Creditsbutton to englishvanilla. Fixed: Title & objective in videoplayer being shown in manualvideo contenttype
|
2019-05-07 18:04:58 +03:00 |
|
Joonas Rikkonen
|
47abb30bef
|
(2a2494e33) Fixed tutorial names not being translated
|
2019-05-06 11:37:28 +03:00 |
|
Joonas Rikkonen
|
fb21005258
|
(6f4bea467) Updated doors
|
2019-05-03 13:43:47 +03:00 |
|
Joonas Rikkonen
|
fbb7daed00
|
(0c3442136) Merge branch 'dev' into docking-interface
|
2019-05-03 13:41:23 +03:00 |
|
Joonas Rikkonen
|
b551ae7999
|
(c1468d39d) Overhauled docking interface (WIP)
|
2019-05-03 13:39:54 +03:00 |
|
Joonas Rikkonen
|
c0b8a26bfc
|
(63010b9f0) Fixed incorrect keybinds being displayed in a couple of tutorial texts
|
2019-04-29 21:18:52 +03:00 |
|
Joonas Rikkonen
|
2aec2414be
|
(12d32b875) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-26 11:25:25 +03:00 |
|
Joonas Rikkonen
|
3eb883fbb3
|
(9253f5b70) Added libvlc.so to LinuxClient
|
2019-04-26 11:25:10 +03:00 |
|
Joonas Rikkonen
|
a3ba709e92
|
(befc20623) Fixed extremely small objective texts on lower resolutions, don't scale objective texts (not needed because we change font sizes according to the resolution now)
|
2019-04-26 11:19:46 +03:00 |
|
Joonas Rikkonen
|
79c31d1a83
|
(0185896f9) More fixes to messagebox & tutorial info box scaling
|
2019-04-26 11:19:32 +03:00 |
|
Joonas Rikkonen
|
010411d434
|
(66fc3d1f9) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-26 11:18:31 +03:00 |
|
Joonas Rikkonen
|
d425064a3b
|
(28c455ff7) Improve the ai repair tool usage.
|
2019-04-26 11:18:14 +03:00 |
|
Joonas Rikkonen
|
0dba9947f3
|
(1d84e98c2) Forgot to revert some values back when fixing up the tutorial info windows
|
2019-04-26 11:16:41 +03:00 |
|
Joonas Rikkonen
|
8e15be3d42
|
(57e816cad) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-26 11:15:52 +03:00 |
|
Joonas Rikkonen
|
fa25735e9f
|
(3851196d8) Show the campaign disclaimer when entering the New Game or Tutorials tab for the first time.
|
2019-04-26 11:15:37 +03:00 |
|
Joonas Rikkonen
|
e1924f517f
|
(53ca31b28) Removed: Unused tutorialsub, unused enum from tutorials
|
2019-04-26 11:15:19 +03:00 |
|
Joonas Rikkonen
|
ee1672408f
|
(0bf65db0b) Removed: ContextualTutorial structure from tutorials.xml
|
2019-04-26 11:14:15 +03:00 |
|
Joonas Rikkonen
|
a7f56ced21
|
(3cc40bf1d) Added prefabs for new autodoors. Replaced doors in Dugong and Bunyip
|
2019-04-26 11:13:43 +03:00 |
|
Joonas Rikkonen
|
f3fbaedb42
|
(a0a15e2cb) Removed: ContextualTutorial related calls
|
2019-04-26 11:13:25 +03:00 |
|
Joonas Rikkonen
|
4f746b04ea
|
(b8e5081e1) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-25 18:14:20 +03:00 |
|
Joonas Rikkonen
|
eb7ac2bfbe
|
(8e98e6343) Add and implement new clown gear.
|
2019-04-25 18:13:47 +03:00 |
|
Joonas Rikkonen
|
07b937ca90
|
(ce70f0edf) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-25 18:13:28 +03:00 |
|
Joonas Rikkonen
|
03797df87b
|
(224725392) fixed default state of a few emergency pumps.
|
2019-04-25 18:12:55 +03:00 |
|
Joonas Rikkonen
|
f365bdc92f
|
(a66d0118e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-25 18:11:45 +03:00 |
|
Joonas Rikkonen
|
c455bda37e
|
(6f4d8cd0e) Added: Dimmed background for info frames. Fixed: Highlight waits to be only a frame as it seems to be enough
|
2019-04-25 18:11:27 +03:00 |
|
Joonas Rikkonen
|
4ecda00b1f
|
(6c54b9b29) Slight improvements to tutorial windows
|
2019-04-25 18:10:53 +03:00 |
|
Joonas Rikkonen
|
31546e40bb
|
(b89fa807d) Removed: Leftover yield return null
|
2019-04-25 18:10:19 +03:00 |
|
Joonas Rikkonen
|
f43bc25e2f
|
(6aaa50391) Added: Prevention of using the autotemp before the operating portion of the reactor tutorial is complete in engineer's tutorial
|
2019-04-25 18:10:02 +03:00 |
|
Joonas Rikkonen
|
87dd5042e6
|
(bc52b535a) Added: Highlighting to order options in Captain's tutorial
|
2019-04-25 18:09:28 +03:00 |
|
Joonas Rikkonen
|
e83dba2959
|
(42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev
|
2019-04-25 18:07:37 +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
|
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
|
f676e8c67e
|
(914a15437) Fixed: Checking for jobs using name instead of the prefab identifier
|
2019-04-03 16:22:26 +03:00 |
|
Joonas Rikkonen
|
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 |
|