e3ca616fff
(869ac975f) Merge branch 'master' into dev
2019-06-12 16:43:56 +03:00
eaf4f6afb8
(face37755) Fixed clients timing out when trying to connect to a server that has banned someone. Closes #1568
2019-06-12 16:43:34 +03:00
a145b04662
(9f1c10ee0) Update the ladder and gap reference if the waypoint is moved around in the editor. TODO: stairs.
2019-06-11 21:42:39 +03:00
11c014bb46
(00d02cb8a) Change the waypoint debug info a bit.
2019-06-10 17:54:51 +03:00
bea7b58ff3
(a410fd46c) Trying to help the merge script through a jungle of merges
2019-06-04 16:37:31 +03:00
19b4caa576
(a7fed8657) More punctuation fixes
2019-05-16 07:01:26 +03:00
3c8707fc16
(d9d8b0f27) Always display waypoint ids in debug draw. Adjust the positions and the colors.
2019-05-16 05:12:44 +03:00
e83dba2959
(42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev
2019-04-25 18:07:37 +03:00
044fd3344b
2f107db...5202af9
2019-03-18 21:42:26 +02:00
6c0679c297
38f1ddb...178a853: v0.8.9.1, removed content folder
2019-03-18 20:39:27 +02:00
627d6ecd78
Minor UI fixes
2017-12-29 21:09:53 +02:00
4f0b190371
Some more hard-coded text removal
2017-12-27 14:40:33 +02:00
0ce9acb76a
fix things
2017-12-16 21:45:30 +03:00
8ab97af456
Allow sub makers to alter the ID Card's description property on spawn points
2017-12-16 21:30:18 +03:00
96a64d45dc
Moved MapEntity saving methods to the shared project (the server needs to be able to save subs in the campaign mode)
2017-08-30 18:09:48 +03:00
64ad5e5003
Removed unnecessary using directives
2017-07-05 18:35:09 +03:00
4d225c65f2
Updated to MonoGame 3.6 + Directory refactor
...
- Barotrauma's projects are in the Barotrauma directory
- All libraries are in the Libraries directory
- MonoGame is now managed by NuGet, rather than referenced from the installed files (TODO: consider using PCL for easier cross-platform development?)
- NuGet libraries are not included in the repo, as getting the latest versions automatically should be preferred
- Removed Content/effects.mgfx as it didn't seem to be used anywhere
- Removed some references to Subsurface directory
- Renamed Launcher2 to Launcher
2017-06-27 09:52:57 -03:00
Joonas Rikkonen
Alex Noir
juanjp600