Joonas Rikkonen
|
c0192ad19b
|
(fd98de428) Merge branch 'tutorial-rework' of github.com:Regalis11/Barotrauma-development into tutorial-rework
|
2019-03-27 20:51:47 +02:00 |
|
Joonas Rikkonen
|
5a620ec60d
|
(771621c77) Added: Delays for medical & flooding tutorials, resetting of injuredmember when starting again
|
2019-03-27 20:51:33 +02:00 |
|
Joonas Rikkonen
|
723df67f6f
|
(f68ad6ccc) Minor changes to tutorial texts
|
2019-03-27 20:51:17 +02:00 |
|
Joonas Rikkonen
|
0f405512b2
|
(69e52eea2) Fixed: Tutorial not resetting properly on retry
|
2019-03-27 20:51:03 +02:00 |
|
Joonas Rikkonen
|
8b5e18c348
|
(edf82e6ca) Modified: VideoPlayer video position, medical objective completion, saving segment when objective is completed
|
2019-03-27 20:50:50 +02:00 |
|
Joonas Rikkonen
|
91e87e8b74
|
(f9949667c) Modified: Default video resolutio multiplied by 1.5, default text width for video set to 450
|
2019-03-27 20:50:35 +02:00 |
|
Joonas Rikkonen
|
ff20f7f374
|
(936119c69) Fixed: Aligning problems when an objective is removed, crashing when EnemyOnSonar is triggered, dead monsters still counting for EnemyOnSonar, ReactorCommand objective to complete when the order is given.
|
2019-03-27 20:50:21 +02:00 |
|
Joonas Rikkonen
|
3b8aeb27c5
|
(aefc763e9) Changed tutorial navconsole text and fixed tag
|
2019-03-27 20:50:07 +02:00 |
|
Joonas Rikkonen
|
69852a141e
|
(6840c9114) Set the objective frame to be drawn behind other gui elements. TODO: test and complain if doesn't work ;)
|
2019-03-27 20:49:53 +02:00 |
|
Joonas Rikkonen
|
5c324a6de9
|
(4ad359147) Fix an index out of array exception when trying to set the update order (draw order) while the updateList contains no elements.
|
2019-03-27 20:49:38 +02:00 |
|
Joonas Rikkonen
|
632dce88c0
|
(cba4939e3) Formatting
|
2019-03-27 20:49:24 +02:00 |
|
Joonas Rikkonen
|
2cdc7ce5f3
|
(57c934c4b) Added: Padding for video text, missing xml elements for titles, instructions.
|
2019-03-27 20:49:10 +02:00 |
|
Joonas Rikkonen
|
179b17e9aa
|
(093cf0b49) Merge branch 'tutorial-rework' of https://github.com/Regalis11/Barotrauma-development into tutorial-rework
|
2019-03-27 20:48:56 +02:00 |
|
Joonas Rikkonen
|
68aa95a5df
|
(351e4f8b8) Added: hiding of objectives via button
|
2019-03-27 20:48:42 +02:00 |
|
Joonas Rikkonen
|
a90ce22107
|
(8be88da45) Included videos in project, added them to xml
|
2019-03-27 20:48:29 +02:00 |
|
Joonas Rikkonen
|
27efec90c9
|
(ef6d724ea) Fixed: Invalid pathname when triggering a video for the first time
|
2019-03-27 20:48:13 +02:00 |
|
Joonas Rikkonen
|
7140151882
|
(c9b5d70ff) Removed: Hardcoded video path
|
2019-03-27 20:47:58 +02:00 |
|
Joonas Rikkonen
|
12f963d2a5
|
(094e3b371) Merge branch 'tutorial-rework' of https://github.com/Regalis11/Barotrauma-development into tutorial-rework
|
2019-03-27 20:47:44 +02:00 |
|
Joonas Rikkonen
|
37f44b87fa
|
(43425b834) Added: Video looping, replaying, pre-video text
|
2019-03-27 20:47:30 +02:00 |
|
Joonas Rikkonen
|
cf49c179dc
|
(34c324230) New tutorial videos
|
2019-03-27 20:47:15 +02:00 |
|
Joonas Rikkonen
|
e65b688edd
|
(44ca39e16) Added: Escaping the video player via enter, multiple objective tracking & removing
|
2019-03-27 20:46:58 +02:00 |
|
Joonas Rikkonen
|
474099732b
|
(f8525130a) Added: Objective tracking, UI changes.
|
2019-03-27 20:46:44 +02:00 |
|
Joonas Rikkonen
|
a939cdef91
|
(a58bf1e5d) Added: Fonts, layouting to video with objective
|
2019-03-27 20:46:27 +02:00 |
|
Joonas Rikkonen
|
bbfb472122
|
(ed863473d) Added: New tutorial content & UI
|
2019-03-27 20:46:13 +02:00 |
|
Joonas Rikkonen
|
7ea3e1b20c
|
(9801d8289) Added: Handling of error cases when video is not found
|
2019-03-27 20:45:58 +02:00 |
|
Joonas Rikkonen
|
556d86ed4f
|
(bce1100e8) ClientCode.projitems update
|
2019-03-27 20:45:45 +02:00 |
|
Joonas Rikkonen
|
ff4ecd15b3
|
(c7ebe3cdb) Fixed: Old TextManager.Get call
|
2019-03-27 20:45:30 +02:00 |
|
Joonas Rikkonen
|
3f82c9a2cb
|
(f417b026f) Fetched: Changes for playing video tutorial from local branch
|
2019-03-27 20:45:14 +02:00 |
|
Joonas Rikkonen
|
e65c669eaa
|
(2aa0ff8d3) Do not copy Muikku to output directory
|
2019-03-27 13:53:07 +02:00 |
|
Joonas Rikkonen
|
b3a4efdd6f
|
(c368a04c8) Added a longer version of Muikku, renamed to Selkie
|
2019-03-27 13:52:53 +02:00 |
|
Joonas Rikkonen
|
eada5e222a
|
(4e7f7d0a7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-27 13:52:38 +02:00 |
|
Joonas Rikkonen
|
8d42f777db
|
(3525199b1) First iteration of the new Charybdis (incomplete). TODO: tweak joints and animations, add deformations, attacks, ai, and sounds.
|
2019-03-27 13:52:22 +02:00 |
|
Joonas Rikkonen
|
66af3464a9
|
(4d472a71c) Removing an item after it's been combined doesn't trigger the OnBroken StatusEffects (e.g. combining two half-full flash powder jars doesn't cause them to explode), made all crafting materials disappear after they've been fully used. Closes #1303
|
2019-03-27 13:52:04 +02:00 |
|
Joonas Rikkonen
|
e5fd660479
|
(c83fafea0) Fixed items in the characters inventory always starting at 100% condition client-side even if they had deteriorated during the previous round. Closes #1359
|
2019-03-27 12:10:35 +02:00 |
|
Joonas Rikkonen
|
b6f6fd64a3
|
(9f2fea0dd) Fixed divide by zero exception in Mission.LoadRandom if no missions can be received from the location.
|
2019-03-27 12:10:21 +02:00 |
|
Joonas Rikkonen
|
fd56875e95
|
(98a962701) Close the save/load dialogs when leaving the sub editor. Otherwise they'll still be visible when re-entering the editor, and saving at that point will overwrite the previously loaded sub with an empty one. Closes #1357
|
2019-03-27 11:31:30 +02:00 |
|
Joonas Rikkonen
|
26a3f866ee
|
(a3947cb13) Batteries output charge values as ints. Closes #1358
|
2019-03-27 11:31:16 +02:00 |
|
Joonas Rikkonen
|
065173f3f7
|
(c417b7693) Decreased structure damage done by frag grenades (they weren't very practical for defending against intruders because they tended to blow up half the sub) and made them disappear after they've exploded. Closes #1317
|
2019-03-27 11:30:47 +02:00 |
|
Joonas Rikkonen
|
bb17463aae
|
(f5be65240) Optimized explosions a bit, toned down wall damage effect when the wall has a small amount of damage.
|
2019-03-27 11:30:33 +02:00 |
|
Joonas Rikkonen
|
6fd4d14497
|
(8b8693dbf) Allow editing selected wires in wiring mode, made connection panels a little less transparent. Closes #1329
|
2019-03-26 17:34:35 +02:00 |
|
Joonas Rikkonen
|
d60696f895
|
(a0e195312) Don't allow steering with WASD when a textbox is selected. Closes #1353
|
2019-03-26 17:34:21 +02:00 |
|
Joonas Rikkonen
|
20e258f88e
|
(26025de59) Allow panning the campaign map with WASD. Closes #1352
|
2019-03-26 17:34:07 +02:00 |
|
Joonas Rikkonen
|
237f164123
|
(afe15e7b2) Fixed server sending campaign saves and campaign character data to clients after the game mode has been switched to something else. Closes #1346
|
2019-03-26 17:12:45 +02:00 |
|
Joonas Rikkonen
|
6c4649fe3f
|
(4b1fa5c86) Fixed client-side console errors during campaign setup because the client tried to load save files that only exist server-side. Now the server sends the information needed for the campaign setup window in the CAMPAIGN_SETUP_INFO message.
|
2019-03-26 17:10:20 +02:00 |
|
Joonas Rikkonen
|
555d91a3d5
|
(c590657d2) Don't retry decompressing save files or loading sub files if the file doesn't exist
|
2019-03-26 17:10:06 +02:00 |
|
Joonas Rikkonen
|
93f2dfb185
|
(628aa768f) Fix characters always being created in the default folder (#1330).
|
2019-03-26 17:09:35 +02:00 |
|
Joonas Rikkonen
|
8537234b75
|
(df56e74f1) Rename Charybdis as Legacycharybdis. Temporarily disable charybdis events.
|
2019-03-26 17:09:21 +02:00 |
|
Joonas Rikkonen
|
a1ef2732c9
|
(0d12b23e4) Fix the crash due to NaN value in torso or head angle (#1349).
|
2019-03-26 17:09:08 +02:00 |
|
Joonas Rikkonen
|
705d05a308
|
(652745ae0) Fix a crash due to invalid physics when scaling the Mudraptor. If the ragdoll still has invalid settings after trying to reset it, just freeze it to prevent crashing. Return boolean and make CheckValidity public so that we can check and react to the invalid ragdoll state elsewhere.
|
2019-03-26 17:08:53 +02:00 |
|
Joonas Rikkonen
|
56d1f5a054
|
(0df804de8) Add a null check for the character info reference.
|
2019-03-26 17:08:39 +02:00 |
|