 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
|
616efac2bf
|
(19b26d13b) Merge branch 'dev' into human-ai
|
2019-05-16 05:08:39 +03:00 |
|
|
Joonas Rikkonen
|
454dda56c7
|
(1762f02b3) Merge branch 'dev' into human-ai
|
2019-05-16 05:08:22 +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
|
a2c782ef12
|
(bd06e47aa) Added Outpost2 to the project (again, did someone fail a merge?)
|
2019-05-07 16:25:49 +03:00 |
|
|
Joonas Rikkonen
|
a0fc5abf15
|
(8aad24ad4) Removed: Trait display for non-english languages due to missing translations
|
2019-05-07 16:25:15 +03:00 |
|
|
Joonas Rikkonen
|
96a5875b9a
|
(a01a93af6) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-07 16:24:58 +03:00 |
|
|
Joonas Rikkonen
|
cc22268f0e
|
(ae2d4614b) Added: NPCConversation translations
|
2019-05-07 16:24:41 +03:00 |
|
|
Joonas Rikkonen
|
bc55ab10b8
|
(d81130005) added new outpost to project
|
2019-05-07 16:23:50 +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
|
cc46d452fa
|
(92c1061d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-07 16:22:40 +03:00 |
|
|
Joonas Rikkonen
|
6c196186b3
|
(3f6e326ca) Modified: Separator, Added nowhitespace=true to chinese language files
|
2019-05-07 16:22:24 +03:00 |
|
|
Joonas Rikkonen
|
87431202f5
|
(7e6156c25) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-07 16:22:08 +03:00 |
|
|
Joonas Rikkonen
|
e93456e2a2
|
(655930562) Added more localized strings to subs and shuttles
|
2019-05-07 16:21:51 +03:00 |
|
|
Joonas Rikkonen
|
a3daeb3f18
|
(2b5111ae3) Fonts for simplified chinese (TODO: don't load symbols we don't need? The fonts now take up almost 1GB of memory)
|
2019-05-07 16:21:35 +03:00 |
|
|
Joonas Rikkonen
|
d6c05ab062
|
(2e88e97ef) Added: Brazilian Portuguese, French, German, Russian, Simplified Chinese, Traditional Chinese translations
|
2019-05-07 16:20:42 +03:00 |
|
|
Joonas Rikkonen
|
f2f39e87e2
|
(10d1ebded) WIP credits sequence
|
2019-05-07 13:20:33 +03:00 |
|
|
Joonas Rikkonen
|
2c141ef809
|
(376c5d836) added remora and drone to project
|
2019-05-06 11:39:13 +03:00 |
|
|
Joonas Rikkonen
|
e0ddeef023
|
(fa6345c0f) Added option to change fonts based on language, added NotoSansTC for Chinese language
|
2019-05-06 11:36:21 +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
|
950d4f9d27
|
(321b32b3d) Scaled down secure cabinet & moved it to the container atlas
|
2019-05-06 11:33:26 +03:00 |
|
|
Joonas Rikkonen
|
3701f0e957
|
(7e3aa6097) Merge remote-tracking branch 'origin/docking-interface' into dev
|
2019-05-03 13:48:31 +03:00 |
|
|
Joonas Rikkonen
|
fb21005258
|
(6f4bea467) Updated doors
|
2019-05-03 13:43:47 +03:00 |
|
|
Joonas Rikkonen
|
1d7faa8d1d
|
(b778c4641) Docking button works now in the docking interface, change button text depending on whether we're docking/undocking, some placeholder UI graphics for the nav terminal
|
2019-05-03 13:42:19 +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
|
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
|
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
|
1ed937299f
|
(8556f608e) Removed Berilia, Remora & RemoraDrone from the vanilla content package
|
2019-04-26 11:16:25 +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
|
fa004b0067
|
(7422bd0ce) Removed: ContextualTutorial folder, files from project
|
2019-04-26 11:14:46 +03:00 |
|
|
Joonas Rikkonen
|
9d9349c96e
|
(73987cc6a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-26 11:14:32 +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
|
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
|
46ae95ab42
|
(a71afc56d) Added new LampsAdditive.png texture and light texture for Fluorescent L2 lamp
|
2019-04-25 18:12:36 +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
|
e11752276b
|
(9680a2a43) Moved tutorial sub and outpost to tutorial folder
|
2019-04-25 18:11:11 +03:00 |
|
|
Joonas Rikkonen
|
ad028163a2
|
(332bdd387) Added: Content.RootDirectory modifying on macOS
|
2019-04-25 18:08:20 +03:00 |
|