Regalis
7e431c7dfd
Merge branch 'master' into new-netcode
...
Conflicts:
Subsurface/Source/Items/Components/Machines/Deconstructor.cs
Subsurface/Source/Items/Components/Machines/Fabricator.cs
2017-03-23 18:58:18 +02:00
Regalis
e9e4e5f9d3
Level cells that overlap with ruins are removed during level generation (instead of just disabling collisions with them), background sprites can spawn on ruin walls
2017-03-23 18:13:28 +02:00
Regalis
823ad12058
Some refactoring: made PosInfo a class and moved character-specific fields to a "CharacterStateInfo" subclass
2017-03-21 19:36:28 +02:00
Regalis
2722d3cf8d
Merge branch 'master' into new-netcode
...
Conflicts:
Subsurface/Source/Events/MonsterEvent.cs
2017-03-21 18:16:25 +02:00
Regalis
7c6ea5b1c0
LightSource vertices are recalculated if another submarine within the range of the light has moved relative to the sub the light is in
2017-03-20 17:15:12 +02:00
Regalis
40f5f352f5
- pasted entities are assigned to the main sub (-> entities copypasted from another sub are saved)
...
- fixed submarinebody attempting to generate a physics body for a sub with no walls if there are some other walls loaded
- MathUtils.GiftWrap doesn't throw an exception if passed an empty list of points
2017-03-15 23:59:23 +02:00
Regalis
5bdb57b98a
Merge branch 'master' into new-netcode
...
Conflicts:
Subsurface/Properties/AssemblyInfo.cs
Subsurface/Source/Characters/AICharacter.cs
Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
Subsurface/Source/Characters/Character.cs
Subsurface/Source/GameMain.cs
Subsurface/Source/Items/Components/Signal/Connection.cs
Subsurface/Source/Items/Item.cs
Subsurface/Source/Networking/GameServer.cs
Subsurface/Source/Networking/GameServerLogin.cs
Subsurface/Source/Physics/PhysicsBody.cs
2017-03-11 13:24:09 +02:00
juanjp600
d6c292a2cc
SharpFont + ScalableFont implementation
...
https://github.com/Robmaister/SharpFont
TODO: replace Code Bold.otf with the full version, fix any bugs, build on Linux, possibly move ToolBox string wrapping and limiting logic to ScalableFont class for better results.
2017-03-07 13:44:42 -03:00
juanjp600
ecb7500df9
Converted UInt32 ID's to UInt16
...
TODO: test everything, make sure nothing broke
2017-03-06 16:25:12 -03:00
Regalis
e059a08688
Optimized lightsource raycasts
2017-03-03 00:02:43 +02:00
Regalis
f04a00f6e1
Merge branch 'lighting-optimization'
2017-03-02 19:39:55 +02:00
Regalis
335ee8c72e
Warning message about unlinked vents is only shown once when saving (not for each vent)
2017-03-02 19:39:00 +02:00
juanjp600
f2db3c6b20
Merge remote-tracking branch 'barotrauma/master' into lighting-optimization
2017-03-01 15:02:23 -03:00
juanjp600
84a8232c1a
Fixed override sprite scaling
...
Now it looks right.
2017-02-28 19:38:25 -03:00
juanjp600
4568f34f39
Rotating lights and overridden textures
...
The flashlight has the correct texture now, but something still seems off about the UV coordinates. Scaling is probably incorrect.
2017-02-28 19:19:02 -03:00
Regalis
9e16542b13
Replaced the arrows in server lobby buttons with images, made GUIImages rotatable (todo: make them align correctly when rotated/scaled), fixed the size of the sub save warning messagebox
2017-02-27 22:28:10 +02:00
Regalis
22d40077fa
Fixed exception in LightSource if ConvexHullList for hulls outside the sub hasn't been generated (i.e. if switching to game mode using console commands), removed some debug code
2017-02-27 18:53:34 +02:00
Regalis
68a0320935
LightSources cache the light vertices in vertex buffers and only recalculate if needed
2017-02-27 00:41:50 +02:00
Regalis
f3f875e641
Calculating light volumes works now. Very poorly optimized at the moment, todo: cache volumes and only recalculate when needed
2017-02-26 21:33:32 +02:00
Regalis
abfe2261d2
- ConvexHulls consist of Segments and SegmentPoints which keep references to each other
...
- LightSources fetch a list of non-backfacing ConvexHull segments within their range, and sort the points counter-clockwise (TODO: calculate triangles from the points)
- fixed incorrectly working CircleIntersectsRectangle method
2017-02-26 01:17:22 +02:00
Regalis
bcabe4ab39
Disabled convexhull shadow caching
2017-02-25 21:50:24 +02:00
Regalis
844097b132
Initial steps in making the light rendering use light volumes instead of shadow volumes to allow rendering the lights in one batch.
...
So far just disabled shadow rendering and cleaned up some unnecessary stuff
2017-02-25 21:24:38 +02:00
Regalis
b8c3b9c29f
- sub editor shows a warning upon saving if there are entities way outside the sub
...
- warnings are shown in a GUIMessageBox instead of the debug console
- added a submarine indicator to the editor
2017-02-24 00:01:46 +02:00
Regalis
7f7ac76484
Merge branch 'master' into new-netcode
...
Conflicts:
Subsurface/Source/Characters/Character.cs
Subsurface/Source/GUI/GUI.cs
Subsurface/Source/GUI/LoadingScreen.cs
2017-02-13 22:04:28 +02:00
Regalis
1ea3044fd6
Firesource sound fix
2017-02-13 21:12:15 +02:00
Regalis
5871faa2dd
Added a few new console commands: disablehud, lockx & locky (disables submarine movement on the respective axis), followsub (toggles whether the camera moves with the subs)
2017-02-13 16:23:28 +02:00
Regalis
52bf73722f
ServerEntityEventManager doesn't process received events until the character inputs of the client for the corresponding frame have been processed (fixes character movement lagging behind EntityEvents at the servers side)
...
+ split character networking logic into a separate file, characters drop items at the position of their collider instead of hands
2017-02-09 23:09:42 +02:00
Regalis
fb1f90e226
Fixed docked subs being moved twice when syncing sub position
2017-01-26 19:04:26 +02:00
Regalis
15b3dd31a8
Merge branch 'master' into new-netcode
2017-01-25 20:30:26 +02:00
Regalis
f7ac98ab5f
Broken items can be repaired, fixed clients never removing firesources (causing the lights to stay after the flames have been extinguished)
2017-01-14 20:30:46 +02:00
Regalis
bd7766d3e7
Server clears EntityEventManager before starting a new round, not just when ending it (fixes events breaking during the next round if an item created an event when unloading the previous sub) + some additional error checks
2017-01-14 20:26:41 +02:00
Regalis
8a9b322b78
Clients can create firesources if server tells them to, extinguishing fixes
2017-01-11 18:03:01 +02:00
Regalis
beac45458e
Transforming received in-sub mouse coordinates to outside coordinates if the character is outside and vice versa, HiddenSubPosition fix (can't use Level.Loaded to find the top of the level because the level isn't loaded yet)
2017-01-05 19:08:54 +02:00
Regalis
518eea746e
Transforming in-sub MemPos/MemLocalPos coordinates to outside coordinates if the character is outside and vice versa, server doesn't start sending ingame updates until they receive the first ingame update message from the client (no need to send updates while the client is loading or if they fail to start the round)
2017-01-05 18:16:58 +02:00
Regalis
9a69126b1c
Fixed OnMapLoaded not being called on MapEntities that don't belong to any sub (due to this, gaps weren't created on doors in alien ruins until the game starts running, which occasionally caused entity ID mismatches between clients and the server), changelog update
2016-12-31 13:26:50 +02:00
Regalis
1bba276949
Fixed OnMapLoaded not being called on MapEntities that don't belong to any sub (due to this, gaps weren't created on doors in alien ruins until the game starts running, which occasionally caused entity ID mismatches between clients and the server)
2016-12-30 18:01:15 +02:00
Regalis
1f07b18e5b
Merge branch 'master' into new-netcode
...
Conflicts:
Subsurface/Properties/AssemblyInfo.cs
Subsurface/Source/Items/Components/DockingPort.cs
Subsurface/Source/Items/Components/Signal/Wire.cs
Subsurface/Source/Items/Item.cs
2016-12-29 22:18:27 +02:00
Regalis
c01ac33e1d
Option to configure damage sounds for structures with a specific tag, some new sounds
2016-12-21 00:07:25 +02:00
Regalis
32c7edba1c
Explosion damage calculations take the size of the limbs into account (e.g. it's possible to damage endworms with explosives that have a damage radius less than 600)
2016-12-20 19:28:25 +02:00
Regalis
dd46ce1d98
Adjusting submarine spawnposition if the sub (or any docked subs) intersect with walls
2016-12-20 16:11:47 +02:00
Regalis
311f388358
Limbs with no sprite don't cause the game to crash anymore, lightsources attached to a limb are drawn at the interpolated position (= DrawPosition) of the limb, lightTexture origin is flipped on the X-axis when parent limb flips
2016-12-17 14:24:54 +02:00
Regalis
d7ed27381f
List of linkable subs in the editor is refreshed after saving a new sub
2016-12-14 17:00:09 +02:00
Regalis
a2f19a3b16
The size of the docked subs is taken into account when generating the level
2016-12-13 23:21:47 +02:00
Regalis
2ef7c2f996
Preventing ruins from spanning above the top of the level
2016-12-13 23:14:41 +02:00
Regalis
40c28a11de
Docked subs are forced to correct positions during loading and the docking is "locked" (subs won't get stuck inside each other even if the linked sub is placed incorrectly in the editor)
2016-12-13 23:12:56 +02:00
Regalis
6a189c6ec4
Fix for "collection was modified" exceptions when removing entities using delete or Ctrl+X
2016-12-12 15:01:50 +02:00
Regalis
f9ea876edf
- sub list in the main menu is refreshed when MainMenuScreen is selected (-> downloaded and newly created subs appear in the list)
...
- fixed "editing menu" not disappearing after an entity is removed in the editor
- debugconsole textbox is automatically selected when opening the console
- clearing the current gamesession if returning to main menu using the console
2016-12-12 14:49:16 +02:00
Regalis
fdf99cddcb
Replaced the solid black color inside wall cells with an ice texture, background ice textures loop better
2016-12-11 21:41:24 +02:00
Regalis
3411448ae8
Submarine position syncing improvements
2016-12-10 19:53:35 +02:00
Regalis
1f454d593e
Inventory syncing, objHeader is passed to the ClientRead/ServerRead methods so they can determine how to read the msg (is it an inventory update, position, input, etc)
2016-12-10 16:39:58 +02:00
