juanjp600 1dc255bc2f Merge branch 'master' into dedicated-server ...

# Conflicts:
#	BarotraumaClient/Source/GameSettings.cs
#	BarotraumaClient/Source/Screens/NetLobbyScreen.cs

2017-06-23 10:21:02 -03:00

..

Levels

Merge branch 'master' into dedicated-server

2017-06-23 10:21:02 -03:00

Map

Console colors, begin RNG rework

2017-06-19 21:30:57 -03:00

Entity.cs

Ingame syncing kinda works

2017-06-20 22:28:18 -03:00

EntityGrid.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00

Explosion.cs

Merge branch 'master' into dedicated-server

2017-06-23 10:21:02 -03:00

FireSource.cs

Split Machines ItemComponents

2017-06-18 14:36:11 -03:00

Gap.cs

Split Machines ItemComponents

2017-06-18 14:36:11 -03:00

Hull.cs

Split Machines ItemComponents

2017-06-18 14:36:11 -03:00

IDamageable.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00

LinkedSubmarine.cs

Split Machines ItemComponents

2017-06-18 14:36:11 -03:00

MapEntity.cs

Further separation of client-specific code

2017-06-16 16:02:07 -03:00

MapEntityPrefab.cs

Reducing usage of #if CLIENT / #elif SERVER

2017-06-14 17:30:40 -03:00

Md5Hash.cs

Reorganized project to start work on dedicated server

2017-06-11 03:48:08 -03:00

Structure.cs

Split Machines ItemComponents

2017-06-18 14:36:11 -03:00

StructurePrefab.cs

Further separation of client-specific code

2017-06-16 16:02:07 -03:00

Submarine.cs

Fixed linked subs not spawning

2017-06-21 14:51:36 -03:00

SubmarineBody.cs

BarotraumaServer compiles

2017-06-18 22:41:44 -03:00

TransitionCinematic.cs

Fixed EndGame not working properly + Fixed exception when clients disconnected during a round

2017-06-22 15:20:11 -03:00

WayPoint.cs

Console colors, begin RNG rework

2017-06-19 21:30:57 -03:00