 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
|
039d07f693
|
(a2943d8b7) Merge branch 'dev' into human-ai
|
2019-05-16 05:04:10 +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
|
5af8170ac6
|
(372c6e60a) More automatic text scaling + merge fix
|
2019-05-06 14:15:40 +03:00 |
|
|
Joonas Rikkonen
|
47abb30bef
|
(2a2494e33) Fixed tutorial names not being translated
|
2019-05-06 11:37:28 +03:00 |
|
|
Joonas Rikkonen
|
029f5fccda
|
(8df97f638) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-06 11:35:46 +03:00 |
|
|
Joonas Rikkonen
|
26eaf244ed
|
(b17b66c5f) updated remora and drone
|
2019-05-06 11:35:29 +03:00 |
|
|
Joonas Rikkonen
|
f42a7c1ec6
|
(69d450d58) Initialize SteamManager before creating the GameMain instance
|
2019-05-06 11:34:36 +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
|
46f5bd5b15
|
(99a5e8cf8) Fix bots not using the ladders when swimming on the water surface. + merge fix
|
2019-04-26 11:29:14 +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
|
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
|
fcdfee6328
|
(333e0a646) Added automatic hull & item repair option to the campaign. TODO: adjust costs, now both options cost a fixed 500 credits. Closes #1314
|
2019-04-15 11:55:49 +03:00 |
|
|
Joonas Rikkonen
|
ae07c3174a
|
(05de9c4) Added Linux launch scripts to the project
|
2019-04-07 21:49:05 +03:00 |
|
|
Joonas Rikkonen
|
d16c470df6
|
(de584e63e) Improved MP campaign setup UI
|
2019-04-07 21:44:28 +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 |
|