 Joonas Rikkonen
|
093f4ce8a6
|
(66e6d897c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 05:55:07 +03:00 |
|
|
Joonas Rikkonen
|
0bb541bce8
|
(2c8e14bca) Added edge variants for new environment base textures
|
2019-05-16 05:54:50 +03:00 |
|
|
Joonas Rikkonen
|
e9664d3639
|
(084340338) Add an aim timer before the weapon can be used. Fix a null reference exception.
|
2019-05-16 05:54:33 +03:00 |
|
|
Joonas Rikkonen
|
38240162cf
|
(841d7d297) Enable mechanic and watchman variants. Remove watchman variant 2 and rename variant 3 as variant 2.
|
2019-05-16 05:53:58 +03:00 |
|
|
Joonas Rikkonen
|
8bfd104f82
|
(ff188f1b7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 05:52:54 +03:00 |
|
|
Joonas Rikkonen
|
64f147ea6c
|
(cb1c8745f) Changed oxygen generator values in Dugong and Remora, recommended crew in Humpback
|
2019-05-16 05:52:38 +03:00 |
|
|
Joonas Rikkonen
|
71685ef28c
|
(3ebdb2066) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 05:52:21 +03:00 |
|
|
Joonas Rikkonen
|
f8a0d54449
|
(d54773ab0) Fix the project references.
|
2019-05-16 05:52:02 +03:00 |
|
|
Joonas Rikkonen
|
f02c7cdda9
|
(ee538829d) Added docking tutorial video, removed highlight from old docking button.
|
2019-05-16 05:51:45 +03:00 |
|
|
Joonas Rikkonen
|
57302f7bb8
|
(4ff749939) Added new environment assets for implementation
|
2019-05-16 05:51:28 +03:00 |
|
|
Joonas Rikkonen
|
049d3ba795
|
(e7bd8839d) Remove unused parameters.
|
2019-05-16 05:51:12 +03:00 |
|
|
Joonas Rikkonen
|
fd7dfebd3a
|
(50c25dbf6) Added a "back" button that closes the credits, minor credits tweaks
|
2019-05-16 05:50:39 +03:00 |
|
|
Joonas Rikkonen
|
068089ae5c
|
(d622ac851) Fix double updates of current orders.
|
2019-05-16 05:47:36 +03:00 |
|
|
Joonas Rikkonen
|
bb6bffe88a
|
(b597640aa) Implemented the new splash videos (each can be skipped separately), language selection on first startup works now
|
2019-05-16 05:47:02 +03:00 |
|
|
Joonas Rikkonen
|
68ced76e1b
|
(cc26984a5) Merge remote-tracking branch 'origin/dev' into human-ai
|
2019-05-16 05:45:37 +03:00 |
|
|
Joonas Rikkonen
|
f8090d470e
|
(5670a7c58) Don't get stuck if cannot use the button.
|
2019-05-16 05:44:48 +03:00 |
|
|
Joonas Rikkonen
|
5ec107bf83
|
(0d96091e5) Adjusted layout spacing on Reactor to make the warning labels slightly more readable on Brazilian Portugese
|
2019-05-16 05:43:40 +03:00 |
|
|
Joonas Rikkonen
|
de2246fe57
|
(e0d673b0d) Test: Don't calculate the distance to the buttons when seeking path. Instead, check the distance when checking the doors. Allows the bots to access the Remora ballast through the door where the button is a bit farther from the door than usually.
|
2019-05-16 05:42:51 +03:00 |
|
|
Joonas Rikkonen
|
828150e0ae
|
(9d8f050b8) Added text wrapping to ItemInventory titles and changed pump GUI In/Out text to use a smaller font
|
2019-05-16 05:42:34 +03:00 |
|
|
Joonas Rikkonen
|
1d5de494cd
|
(a185ec0cd) Don't report on broken items that have condition above the threshold. Optimize and fix.
|
2019-05-16 05:41:25 +03:00 |
|
|
Joonas Rikkonen
|
79d01822d2
|
(8015dd67d) Show a language selection prompt when launching the game for the first time (WIP)
|
2019-05-16 05:41:09 +03:00 |
|
|
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
|
e4f41789b0
|
(143d158cb) Merge branch 'dev' into human-ai
|
2019-05-16 05:25:02 +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
|
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 |
|