Commit Graph

26 Commits

Author SHA1 Message Date
juanjp600
72033a581e Merge remote-tracking branch 'refs/remotes/barotrauma/master'
Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GUI/GUI.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/GameSettings.cs
	Subsurface/Source/Items/CharacterInventory.cs
	Subsurface/Source/Items/Components/ItemComponent.cs
	Subsurface/Source/Items/Components/Machines/Pump.cs
	Subsurface/Source/Items/Components/Machines/Radar.cs
	Subsurface/Source/Items/Components/Machines/Steering.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Inventory.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Items/ItemSpawner.cs
	Subsurface/Source/Map/Levels/WaterRenderer.cs
	Subsurface/Source/Map/LinkedSubmarine.cs
	Subsurface/Source/Map/Map/Map.cs
	Subsurface/Source/Map/Structure.cs
	Subsurface/Source/Map/Submarine.cs
	Subsurface/Source/Map/WayPoint.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs
	Subsurface/Source/Screens/GameScreen.cs
2016-10-11 20:19:25 -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
54f3d09af4 Update/rendering logic separation (cherrypicked from commits 9ca3b24, bddcc36 & 9511bae) 2016-10-05 20:35:18 +03:00
Regalis
8cac5b2ad2 Removed duplicate child update code from GUIListBox 2016-10-05 18:29: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
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
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
19d3d793e7 Artifacts don't have to be inside the main sub when exiting, gap particle positioning bugfix, waypoints that aren't inside a hull are displayed in blue (easier to spot waypoint issues), a warning is displayed if trying to choose a shuttle as the submarine in SP, random sub selection in MP ignores shuttles 2016-08-13 18:26:40 +03:00
Regalis
d4338580c7 updated changelog, transparent debug console frame, stuff 2016-08-08 23:32:32 +03:00
Regalis
19915fc4e5 - server log and item lists in editor can be filtered
- changes to item highlighting logic (easier in cramped subs)
- sub name/description boxes and selected items are reset when leaving the editor
2016-07-06 18:10:22 +03:00
Regalis
14ef736176 "Suicide button" is also usable in single player, unconscious characters can't be selected in sp, fixed resizing textblocks with wrapped text 2016-04-23 17:26:56 +03:00
Regalis
e84e72bba6 Borderless windowed mode, mid-round settings menu 2016-04-22 20:55:56 +03:00
Regalis
08daab9d87 - AI equips a diving suit before going out
- placing a firesource outside any hull won't crash the game
- scrollbars aren't gray
- fixed client crashing if in the lobby when a round ends
- fixed password box crashing
2016-01-25 18:47:19 +02:00
Regalis
278371638e - Fixed structure-gap links not being saved
- Saving gap orientation
- Waypoint generation works with small hulls and even if SubBody doesn't exist
- Fixed charactermode when a editing mid-round
- Fixed powercontainer charge progressbar position
2016-01-24 21:28:27 +02:00
Regalis
bc9ff32023 New pump & railguncont sprites, saving fixes (disappearing items fixed?), moving LightManager.ViewPos to railgun when aiming, generating waypoints outside sub, easier wire node editing, characters stand when using a controller, shiftsummary crew status scrolling, stuff 2016-01-04 01:03:37 +02:00
Regalis
cb1513f5e6 Lobbyscreen store fixes, sub name textbox & save button in sub editor, transitioncinematic on crew death, saving reactor state, radar marker position fix, minimap fix, button sounds, artifact positioning fix, better LegUp prevention method, some music clips when round ends 2016-01-03 01:13:32 +02:00
Regalis
c9cc94f701 Crew commands 2015-11-26 23:04:02 +02:00
Regalis
cddf4f1bde Sending NetTime at the start of a combined networkevent instead of individual networkevents, syncing itemcomponents for spectators, AICharacter importantentityupdates are sent again, misc bugfixes, some new heads 2015-11-20 17:12:33 +02:00
Regalis
838022fcd5 Switch to Barotrauma & too many misc changes to remember 2015-10-16 18:11:58 +03:00
Regalis
0be4ad4f84 Button&door sounds, sound looping bugfixes, positional sound bugfixes + low pass filter on distant sounds, submarine collision improvements, controller trigger bugfix, humans walk/run more slowly in water 2015-10-04 14:49:05 +03:00
Regalis
29a6260d0f Non-WinForms launcher with auto updater 2015-09-11 22:13:44 +03:00
joonas
bb295a7444 Modified code to compile on Linux 2015-08-19 23:34:20 +03:00
Regalis
bc4ea098f7 v0.1.2: Asynchronous master server connections, largefont, traitor mode ends when traitor dies or sub reaches end of level 2015-08-14 01:59:41 +03:00
Regalis
5771bc7e02 Progress on tutorial 2015-08-11 20:23:48 +03:00
Regalis
85b0cda4ca v0.1 2015-07-31 21:05:55 +03:00