vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,711 Commits 5 Branches 2 Tags
ddfd7274e9e2f668aefb67c1a0ef05ab39e25265
Commit Graph

2711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joonas Rikkonen
ddfd7274e9 (d5ea3c7d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-29 17:24:17 +02:00
Joonas Rikkonen
ca08b803dc (891ef87c3) Fixed: CrewManager throwing errors if changing resolutions when a crewmember is dead. Added: Scaling of the objective list when changing resolutions 2019-03-29 17:24:02 +02:00
Joonas Rikkonen
296ec8bab8 (d95fc9893) Fixed crashing when dragging waypoints in the sub editor due to waypoints not being assigned a prefab 2019-03-29 17:23:47 +02:00
Joonas Rikkonen
af1f8be4fa (ad3954bd2) Moved item HUD closing logic to Character.ControlLocal and removed it from ItemInventory. The deselection in ItemInventory was not synced with the server, causing the item to be immediately reselected after the HUD has been closed (and the logic was redundant anyway because it's also handled in Character). 2019-03-29 17:23:33 +02:00
Joonas Rikkonen
ce359f5309 (93669eac9) Fix cannot close pause menu by pressing esc. 2019-03-29 17:23:19 +02:00
Joonas Rikkonen
ce2131df42 (e4064088d) Close in-game interfaces when pressing esc. Currently only registered when the mouse is over the interface. Originally I intended to make it so that pressing esc always closes the open interface. But let's test this. 2019-03-29 17:23:05 +02:00
Joonas Rikkonen
817a6100d7 (f4680f78f) Made AI characters less eager to load extra fuel to the reactor (the load needs to be 2x higher than the theoretical max output of the reactor). In some subs the reactor's max output is so low that extra fuel is frequently needed, causing AI characters to constantly put in and take out rods as the load fluctuates. + The AI characters now put the excess rods in their inventory instead of dropping them. 2019-03-29 17:22:36 +02:00
Joonas Rikkonen
c7b89aa333 (505161632) Added PAX to the vanilla content package 2019-03-29 17:22:22 +02:00
Joonas Rikkonen
4c1726ed63 (ad2b7c007) Disable editing the vanilla subs in release builds (The subs can still be saved with another name -> can create copies). Change and and add some texts. 2019-03-29 17:22:07 +02:00
Joonas Rikkonen
db1d0acac9 (4d569f38c) AI characters can take out excess fuel rods from the reactor, and calculate if more fuel is needed to keep the output at a suitable level instead of only adding more fuel when the reactor is completely empty. 2019-03-29 17:21:52 +02:00
Joonas Rikkonen
d974a5d72f (3a98135bd) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-29 17:21:37 +02:00
Joonas Rikkonen
c0cf060526 (7d7e17231) Implement reversing and make it as an option for attacks. Detach latching with "F" (debug feature). 2019-03-29 17:20:54 +02:00
Joonas Rikkonen
b9574dde2d (361a8d556) LevelResource fixes: 
- If collecting the resource doesn't require any items, allow it to be picked up withour a repair tool. Closes #1325
- Fixed deattach timer not being synced (the methods were implemented, but the server never sent any events). Closes #1292
- Fixed ridiculously small mineral colliders that made it hard to hit them with the plasma cutter (body size was not updated when the sprites were changed?).
 2019-03-28 18:17:19 +02:00
Joonas Rikkonen
c76fb32e15 (5bab406f1) Fixed "allowInsideFixture" raycasts not working correctly - checking if the ray is inside the AABB is not enough, we also need to take the shape and rotation of the fixture into account. 2019-03-28 18:12:23 +02:00
Joonas Rikkonen
f3dc34dfa3 (d211acd47) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-28 18:12:09 +02:00
Joonas Rikkonen
2490951b2b (6912a70c7) Removed: Unused, old code. Fixed: Formatting 2019-03-28 18:11:54 +02:00
Joonas Rikkonen
f51c9c14df (54ae135f5) Items can be dragged and dropped directly from the inventory into containers without having to select the container first. 2019-03-28 18:11:40 +02:00
Joonas Rikkonen
a351ffcbda (1beb64bd8) Removed: Duplicate code from VideoPlayer 2019-03-28 18:11:25 +02:00
Joonas Rikkonen
2281035ffa (05ee3bb5f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-28 18:11:10 +02:00
Joonas Rikkonen
fde8cc1d6f (9edcbf86d) Added: More prominent graphics for when a tutorial objective is completed 2019-03-28 18:10:56 +02:00
Joonas Rikkonen
98935935c9 (46c711ce2) Made a bunch of ItemContainer UI panels larger 2019-03-28 18:10:41 +02:00
Joonas Rikkonen
68a601722c (34987308f) Fixed reactor warning lights being clickable 2019-03-28 18:10:27 +02:00
Joonas Rikkonen
4ce2316cb2 (8339ae744) Don't allow autointeracting with contained items (e.g. picking up an ammunition box from a loader) if another item is currently selected. Makes it less likely for players to accidentally pick up items from containers when they deselect another item. 2019-03-28 18:10:13 +02:00
Joonas Rikkonen
b9556280fa (1f3241833) Fixed chatmessage "popups" overlapping with the report buttons when the chatbox is hidden, color the name of the speaker according to their job 2019-03-28 18:09:59 +02:00
Joonas Rikkonen
c468b4f6f1 (ccaa0d2e9) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-28 18:09:45 +02:00
Joonas Rikkonen
3ef9374314 (2464ca95d) Implement random factor (0-100%) for the cooldowns. Add some randomness to the attacks of all new characters. 2019-03-28 18:09:32 +02:00
Joonas Rikkonen
9618c9b7e9 (db8417634) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-28 18:09:19 +02:00
Joonas Rikkonen
44a8bfce08 (808e7257d) Attempt to fix the issue where bots are not avoiding walls properly while wandering around. 2019-03-28 18:09:05 +02:00
Joonas Rikkonen
0c15748429 (8bea0a96b) Removed minimum conditions from battery deconstruction output (= deconstructing an empty battery still gives the materials used to craft the battery). Closes #1356 2019-03-28 12:41:06 +02:00
Joonas Rikkonen
bcd779fe78 (519124ad1) Fixed items with no sprite crashing the game. Closes #1153 2019-03-28 12:40:08 +02:00
Joonas Rikkonen
a8222e429f (edb24c37f) Fixed ItemComponents overwriting the Msg-tags ("ItemMsgPressSelect" etc) with the text fetched from the text xml, preventing the texts from being translated after the sub has been saved. 2019-03-28 12:36:11 +02:00
Joonas Rikkonen
d7526934e6 (f7209b813) Draw the sprites of the entities that are being dragged in the sub editor (instead of just a red rectangle). 2019-03-28 12:35:57 +02:00
Joonas Rikkonen
13870a31c4 (962c58b6d) Hide very small resolution options from the settings menu. Addresses (but doesn't fully fix) #1253 2019-03-28 12:35:43 +02:00
Joonas Rikkonen
9849e76f76 (5d39bdb07) Disabled reactors cooling down when underwater. If we want to include this, we need to explain to the player that they may need extra fuel to keep the reactor running when the reactor room is flooded. 2019-03-28 12:35:15 +02:00
Joonas Rikkonen
72e7cb6e99 (b0feecc1f) Use the code that includes wall avoidance for wandering also in AIObjectiveFindSafety and AIObjectiveGetItem when the target is unreachable. 2019-03-28 12:35:01 +02:00
Joonas Rikkonen
05f12a144b (afed4e8fa) Check that the container is in the same hull than the character before allowing to contain items. Might solve the floating diving suit mentioned in #1362. 2019-03-28 12:34:47 +02:00
Joonas Rikkonen
e09740d31e (371088346) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-03-28 12:34:18 +02:00
Joonas Rikkonen
ef7b0f0ccf (edc1704a5) Added: A checkmark and small delay before removal for completed objectives 2019-03-28 12:34:04 +02:00
Joonas Rikkonen
aee0290202 (74f1d04ea) Added interact texts to all items (Interact [E], Pick Up [E], etc), reset messages in all subs. TODO: Saving the subs causes the messages to be converted from text tags ("ItemMsgPressSelect" etc) into the actual texts, preventing the messages from being translated. We could probably just make the property non-editable and use the prefab values, or at least prevent the values from changing in sub files. 2019-03-28 12:33:49 +02:00
Joonas Rikkonen
e6c3d6d537 (6cc2e0541) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-27 21:00:33 +02:00
Joonas Rikkonen
0ab2f2ac69 (29faa9c06) Reinstate charybdis monster events. 2019-03-27 20:57:50 +02:00
Joonas Rikkonen
98224c6ec9 (cc0f963d6) Fixed nullref exception when loading campaign character inventories in single player. 2019-03-27 20:57:36 +02:00
Joonas Rikkonen
776f71647d (3c77ed62a) Add attack, particles (copied from legacy), ai (copied from legacy), and sounds (legacy) to charybdis. Tweak the ragdoll and the animations a bit. 2019-03-27 20:57:23 +02:00
Joonas Rikkonen
8a22dbfebd (92723d062) Increase Hammerhead head attack dmg to characters. 2019-03-27 20:57:10 +02:00
Joonas Rikkonen
7a5f589639 (99336eacb) Modified: Reduced video's textframe alpha 2019-03-27 20:56:55 +02:00
Joonas Rikkonen
4215e97720 (724e27ce7) Made damaged junction boxes less sensitive to overvoltage. Nearly broken junction boxes were barely able to handle any overvoltage, leading to chain reaction where one junction box breaking causes the grid to be overloaded, and the rest of the boxes start taking damage at an increasing speed. Related to #1361 2019-03-27 20:56:42 +02:00
Joonas Rikkonen
7c8f19ee14 (875de4a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-27 20:56:29 +02:00
Joonas Rikkonen
3b786d7ded (e311dc982) Continue working on Charybdis. Add some deformations. Tweak the joints. Redefine the limb types. Tune the animations. 2019-03-27 20:56:14 +02:00
Joonas Rikkonen
86d1102f56 (88961a6ea) Fix wrong spelling: Blatter -> Bladder. 2019-03-27 20:56:01 +02:00
Joonas Rikkonen
963657cd9c (f5d1ca382) Video title padding 2019-03-27 20:55:48 +02:00