Commit Graph

739 Commits

Author SHA1 Message Date
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
Regalis
8e8a0e57f0 Cleaned up the flipping logic a bit, overridable MapEntity.FlipX method 2016-09-30 19:48:56 +03:00
Regalis
0da9f58325 Fixed physics item & wire flipping 2016-09-30 19:00:12 +03:00
juanjp600
f6b82eb095 Some progress on flipping subs
Press crouch to flip every sub in the map, texture alignment breaks and physics items vanish, but other than that it's working.
2016-09-29 22:20:15 -03:00
Regalis
c1cb19b940 More suitable tutorial seed + moloch spawn position, moloch nerf 2016-09-29 19:32:14 +03:00
Regalis
25274dd03f Linux damageshader, fixed keyhits being registered multiple times, added LevelGenerationParams.xml to the vanilla content package 2016-09-29 19:04:45 +03:00
Regalis
cbce785078 - combined the "crew" and "hire" tabs in the SP lobby
- tooltips that show item descriptions in the store menu
- preventing tooltips from going outside the screen
- medical items can be bought, more expensive railgun/depthcharge shells
2016-09-29 18:59:58 +03:00
Regalis
86c50304dd - saving after MainSub has been removed (i.e. saving after returning to map screen) doesn't break save files anymore
- fixed subs getting left behind if the sub moves too far from the start/end position during the ending cinematic
- map shows which LocationConnections have been passed through
2016-09-28 19:16:50 +03:00
Regalis
c5ce3a75a2 Sp campaign map shows which locations have been visited (+ some minor visual improvements to the map) 2016-09-28 16:53:08 +03:00
juanjp600
e22d8adde5 Red name on enemy players
To prevent confusion.
2016-09-27 20:06:02 -03:00
juanjp600
71ebbc00d9 Merged branch master into combat-mission 2016-09-27 19:42:35 -03:00
juanjp600
e318034a1a Remove submarines markers from radar in combat missions
This should make the mission type a lot more fun.
2016-09-27 19:42:15 -03:00
Regalis
2bdc7441fc Merge branch 'level-gen-overhaul' 2016-09-27 20:19:29 +03:00
Regalis
9b15d2f894 Improved background sprite placement logic: orientation of the cell edges determined by their normals instead of their position relative to the cell 2016-09-27 20:18:55 +03:00
Regalis
4e9ea758cb Team IDs start from 1 (-> monsters don't count as members of the team 0) 2016-09-27 17:55:45 +03:00
Regalis
8f0d16b145 Fixed host's character spawning twice, some cleanup (LINQ <3) 2016-09-27 17:31:26 +03:00
juanjp600
344947c3c4 Search and destroy mission
Featuring ugly code
2016-09-26 22:09:06 -03:00
Regalis
790212a20b Merge branch 'walldamage' 2016-09-26 16:28:52 +03:00
Regalis
e91e0a4f9c HUDProgressBars move with the subs 2016-09-26 16:26:52 +03:00
juanjp600
d537e8795a Replace '' (two single quotes) with \" (double quote)
We must correct post-traumatic Blitz disorder
2016-09-24 21:26:08 -03:00
Regalis
ccb50ca28f Particle start color is initialized correctly, small particle collision fix 2016-09-22 21:24:40 +03:00
Regalis
0ba69a3472 Using nonpremultiplied alpha when drawing damaged wall sections (-> no artifacts around windows anymore), particle collision optimization 2016-09-22 18:14:16 +03:00
Regalis
f21000124b 0.5 sec delay when switching from swimming to walking or vice versa (prevents rapid switches between swimming/walking if the water level is fluctuating around the minimum swimming depth) 2016-09-21 20:14:24 +03:00
Regalis
721f4ff5a6 Particle system improvements:
- particles can collide with the outer walls of the sub
- drag + waterdrag parameters
- fixed particles "twitching" when the submarine is moving fast
- submarine velocity only affects the initial velocity of the particles (i.e. accelerating the sub doesn't automatically accelerate them)
2016-09-21 19:45:20 +03:00
Regalis
b01b52172a Topwindow sprite fix, fixed null reference exception when welding/cutting walls that aren't part of a sub 2016-09-21 19:39:00 +03:00
Regalis
96a61ab2ea HUDProgressBars are drawn over the LOS effect, progressbar not displayed when attempting to weld/cut platforms 2016-09-20 19:36:58 +03:00
Regalis
5918e845ac Progress bars that show the health of wall sections when welding/cutting 2016-09-20 18:40:30 +03:00
Regalis
f8368f464a Walls have an additional background sprite below the destructible sprite, separate parameters for rgb and alpha lerping in the damage shader 2016-09-19 21:51:37 +03:00
Regalis
b24359464b Wall damage shader testing (WIP) 2016-09-16 14:47:08 +03:00
Regalis
0265d075a5 Possible to zoom out further when debugdraw is on, vents don't replenish oxygen when underwater, monster missions & events ignore spawnpoints that are too close to the main sub 2016-09-14 20:25:09 +03:00