Commit Graph

88 Commits

Author SHA1 Message Date
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
Joonas Rikkonen 52991e1ded (41a4cf029) Merge 2019-04-25 17:50:53 +03:00
Joonas Rikkonen 8be51d71bd (444f7d53a) Added: Workaround for macOS not allowing editing the .app bundle, using Library/Barotrauma instead 2019-04-25 17:50:35 +03:00
Joonas Rikkonen 457000c8dd (9e2b50b03) Removed unused duplicate texture 2019-04-25 17:49:59 +03:00
Joonas Rikkonen 3a83ac42c9 (dd2b3452f) Social center png added (was missing) 2019-04-25 17:49:41 +03:00
Joonas Rikkonen a90cdb7843 (c5ad20e76) Graphics for outposts: Added new backwalls for outpost rooms (shop,maintenance bay and social center) aswell as some corridor pieces 2019-04-25 17:49:05 +03:00
Joonas Rikkonen f71cb42894 (6d31fd774) Fixed case issues with AlienButton.ogg and AlienPump.ogg 2019-04-25 17:44:41 +03:00
Joonas Rikkonen e938256488 (22afbf1e9) New footstep sounds for crawler, mudraptor & walking on water 2019-04-24 11:50:04 +03:00
Joonas Rikkonen 402e13e78a (1ec677b1b) Added OutpostWall_A.png to the project 2019-04-24 11:48:51 +03:00
Joonas Rikkonen a044313347 (a7b61face) Added automatic bilge pump assembly, updated old airlock doors assembly 2019-04-23 11:17:02 +03:00
Joonas Rikkonen fe163b34b2 (779eec74b) Removed unused wall textures from the project 2019-04-18 12:02:19 +03:00
Joonas Rikkonen b8354d37a5 (d8e711f70) Atlased some background wall sprites, resized SubRearBow.png to power of two, removed some unused textures 2019-04-17 12:44:38 +03:00
Joonas Rikkonen 707d9ed398 (9d7465a38) New alien item sounds 2019-04-16 17:12:27 +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 53f9202909 (8f7813f79) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-15 13:43:50 +03:00
Joonas Rikkonen e839260a9d (a3d3d1671) Health interface layout tweaking, change "drop" to "use as treatment" when dragging an item to the health interface 2019-04-15 13:43:35 +03:00
Joonas Rikkonen 8f310256b5 (2bbea6767) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-15 13:43:07 +03:00
Joonas Rikkonen ffa6192377 (655499f68) Add new variants for some classes (wip). The female textures are placeholders. Rename a bunch of files to support the variants and to organize the files a bit better. Also moved the item definitions around and created dedicated xmls for all the classes. 2019-04-15 13:42:51 +03:00
Joonas Rikkonen fe235eb37a (2fc766fe5) Add support for wearable item variants. Not used yet. Not synced (not sure if it should). 2019-04-15 13:42:37 +03:00
Joonas Rikkonen 918fac9e5e (6c6831abf) Some new sounds, fixed damage sounds not being played if no damage modifiers are applied 2019-04-15 13:42:08 +03:00
Joonas Rikkonen 3b38c7e69e (5616e8c9d) Added image Icons for different sections of the submarine aswell as letters and numbers as decals. NOTE: some of the image icons still needs to be iterated to make them our own 2019-04-15 12:10:19 +03:00
Joonas Rikkonen cb2a0ff49e (65f7be0b6) Update: StructurePrefabs.xml, temp textures for fins, several new lamps, lightcomponent 90 degrees turned -option, icon atlas, 2019-04-15 12:01:18 +03:00
Joonas Rikkonen bd0c8a9d34 (818a83da1) Alternate door versions with integrated buttons 2019-04-10 13:22:39 +03:00
Joonas Rikkonen f278ff212c (370a5daac) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-08 13:35:02 +03:00
Joonas Rikkonen 8a227a4f2c (570318151) Cleanup. 2019-04-08 13:34:48 +03:00
Joonas Rikkonen 153b08065b (12487d533) Added Berilia submarine, 95% complete 2019-04-08 12:06:38 +03:00
Joonas Rikkonen db754188ce (bc739e38f) Added impact sounds to items (e.g. when dropped to the ground). Closes #841 2019-04-07 13:40:53 +03:00
Joonas Rikkonen 14d0daf16d (ccef21f63) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-06 17:49:31 +03:00
Joonas Rikkonen 45c1ed499a (e326112f5) Increased discharge coil sound range and added camera shake to make it more noticeable when it's used 2019-04-06 17:49:18 +03:00