juanjp600
f0f385c2b2
Fixed clients not seeing additional cargo + spawn monster cursor
2016-10-10 11:05:33 -03:00
juanjp600
cb1b975f9f
Merged branch combat-mission into combat-mission
2016-10-10 09:58:06 -03:00
juanjp600
0125ff0f5c
Replace mission GUI box text hack + If both teams die, they both lose
2016-10-10 08:32:31 -03:00
Regalis
74a9453676
Upper limit to water drag force, fixed highlighted items "flickering"
2016-10-09 20:45:28 +03:00
Regalis
d4e9116b0f
Audio channel states visible in debug view + some sound fixes:
...
- a short "cooldown" after each footstep sound (prevents the sound playing multiple times during one footstep)
- water flow sounds are only played by one of the hulls a gap is between
- flow rate affects the range of the flow sound
2016-10-09 20:11:08 +03:00
Regalis
ef9dce9a0d
- fixed exception in GetSubsToLeaveBehind if the round ends when none of the subs is at an exit
...
- water surface is clamped above the bottom of the hull
- character names don't overlap with health bars
2016-10-09 18:20:32 +03:00
Regalis
e7e51fbe0c
Saving times and map seeds are displayed correctly in the "load game" menu
2016-10-09 17:38:01 +03:00
Regalis
f64743a57c
SubInventories return "back to normal" if removed from the parent inventory (e.g. crate inventories aren't drawn above the hand slots after dropping the crate)
2016-10-09 17:36:11 +03:00
Regalis
f7e98ee6a8
Cargo spawning fix again: items are spawned slightly above the bottom of the cargo room (because the item is only inside the hull if pos.Y > hull.rect.bottom)
2016-10-09 17:33:51 +03:00
Regalis
f4c5c5e542
Added a particle trail to railgun shells
2016-10-09 15:13:41 +03:00
Regalis
e720fa366c
Timing.Alpha isn't updated when the game is paused (-> no "twitching" when the pause menu is open), moved water scrolling and surface lerping from draw method to update
2016-10-09 15:12:57 +03:00
Regalis
39c31b10f5
Fixed child rects not being updated when modifying GUIButton or GUITickBox rects
2016-10-09 14:17:22 +03:00
juanjp600
b09eebc9c2
Holding F gives old mousewheel zoom functionality
2016-10-08 18:55:27 -03:00
Regalis
3de4645357
Separated waypoint edit/update methods, fixed items/structures being immediately placed when selecting them in the editor, fixed GUIListBox children ovrlapping with the scrollbar
2016-10-08 19:46:56 +03:00
Regalis
1b66e51970
Additional cargo isn't spawned in shuttles, fixed exception if trying to spawn additional cargo in a sub with no cargo spawnpoint, netlobby chatMsgBox stays selected after sending a chat message
2016-10-08 18:02:25 +03:00
Regalis
1ba87165b0
Fixed camera being placed at {-2147483647, -2147483647} when starting a round, fixed debugdraw crashing the game, moving spectator camera along with the closest sub in Submarine.ForceTranslate
2016-10-08 17:19:54 +03:00
Regalis
e50b801a47
Separate draw/update methods for editingHUD & resizing
2016-10-07 17:06:26 +03:00
juanjp600
94895edbdb
Fixes and minor enhancements for sub editor
...
- Zoom now works relative to the mouse's position rather than the center of the screen, much like Valve's Hammer Editor (or pulsegun's map editor shameless plug ;) )
- Rectangles now have line widths dependent on the camera zoom, not perfect but it's better than having lines disappear
- Fixed background resizing
- Fixed editor being completely broken because of no vsync, might still have a few bugs here and there
- Fixed selection rectangle not rendering at all when dragging from bottom right to top left
- Newline change in Item.cs
2016-10-06 21:15:01 -03:00
Regalis
16ee20aaaa
whoops
2016-10-06 21:26:20 +03:00
Regalis
70b8bf1937
Preventing monsters from spawning too close to any sub (not just the main sub)
2016-10-06 21:17:33 +03:00
Regalis
0ea9600198
Team-specific combat mission descriptions + deepest lore
2016-10-06 19:55:26 +03:00
Regalis
f1762cc6c7
Refactored CombatMission a bit
2016-10-06 16:33:43 +03:00
Regalis
5e88d91cb8
Fixed mutliplayer-only missions being taken into account in the eventprobability calculation even in single player mode, which missions are sp/mp-only is determined in the mission config files
2016-10-06 15:32:38 +03:00
juanjp600
91539c5b84
Host can spawn in team 2 + relay component state syncing
2016-10-05 22:03:06 -03:00
juanjp600
6648e6fd97
Fixed crash with disabled monsters
2016-10-05 20:46:42 -03:00
juanjp600
ffeda27c1b
Restored change lost in conflict resolve
...
Also checking for itemprefab because adding structures wouldn't make any sense here
2016-10-05 17:01:38 -03:00
juanjp600
d839de3258
Merge remote-tracking branch 'refs/remotes/barotrauma/combat-mission'
...
Conflicts:
Subsurface/Source/Networking/GameServerSettings.cs
2016-10-05 16:57:54 -03:00
juanjp600
3d8f5070c5
Added all smallitems to extra cargo list + removed duplicate entries
2016-10-05 16:57:06 -03:00
Regalis
4ebe961024
Simpler method of checking which items to put in the Additional Cargo menu
2016-10-05 20:19:09 +03:00
Regalis
fb28fc8cda
- separate listboxes for both teams in the crew menu
...
- fixed host getting team ID 0
- fixed clients not spawning if their ID is 0 (= if playing a non-combat mission before IDs have been assigned)
- fixed host's character taking part in the job assignment of both teams
2016-10-05 20:15:39 +03:00
Regalis
41c38575b9
Using ItemSpawner to spawn extra cargo (-> clients will be notified of the spawned items)
2016-10-05 18:30:48 +03:00
Regalis
8cac5b2ad2
Removed duplicate child update code from GUIListBox
2016-10-05 18:29:55 +03:00
Regalis
9154be4792
Flipping turrets & controllers, moved radar UI update to UpdateHUD
2016-10-05 16:54:05 +03:00
Regalis
9511baeeb8
Fixed NullReferenceExceptions when dragging an item that isn't in any slot (i.e. a wire)
2016-10-05 15:50:55 +03:00
juanjp600
14ae355f19
Merge remote-tracking branch 'refs/remotes/barotrauma/combat-mission'
...
Conflicts:
Subsurface/Source/GUI/GUIListBox.cs
2016-10-04 22:30:29 -03:00
juanjp600
4874ad2ef8
Host can have subs spawn with more items
...
TODO: check if clients see the extra cargo, they probably don't
2016-10-04 22:28:13 -03:00
Regalis
bddcc36673
Separated inventory update & rendering logic
2016-10-04 23:52:32 +03:00
Regalis
9ca3b24585
Moved some more UI update logic from draw to update
...
todo: inventories (oh the horror)
2016-10-04 20:41:00 +03:00
Regalis
ffc6782025
Removed fixed timestep logic from GameScreen (redundant now because the logic is handled in GameMain)
2016-10-04 19:54:17 +03:00
Regalis
41289c098a
Moved some UI element updates from draw to update
2016-10-04 18:28:56 +03:00
juanjp600
6f136c8daf
Merged branch combat-mission into combat-mission
2016-10-03 22:29:54 -03:00
juanjp600
1187686449
Host can disable spawning of certain characters
...
GUITickBox might not work very well because of the override of Rect, might want to look into that later
2016-10-03 22:27:32 -03:00
Regalis
292218b9b0
WallSection flipping
2016-10-03 22:40:14 +03:00
Regalis
3ec6f008d5
Item/structure sprites flip by default
2016-10-03 16:43:03 +03:00
juanjp600
e1296e4a8e
Backported vsync changes from new-netcode, WIP hull visibility culling
...
The hull culling functions are there, they just aren't being used right now because there are some annoying bugs.
2016-10-02 22:24:31 -03:00
juanjp600
75e7b3a94e
Merged branch master into combat-mission
2016-10-01 20:10:38 -03:00
juanjp600
bdcd894b83
Flipping sprites of staircases & engine
2016-10-01 16:41:16 -03:00
juanjp600
d7047c0df8
Merged branch combat-mission into combat-mission
2016-09-30 15:45:55 -03:00
juanjp600
4c7e8fe57d
Character name scale based on zoom
2016-09-30 15:45:09 -03:00
Regalis
0fe822c96a
Stair body + linkedsub flipping
2016-09-30 20:07:36 +03:00