966 Commits

Author	SHA1	Message	Date
Joonas Rikkonen	b1ee229170	(6c5225d9e) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev	2019-06-09 17:39:50 +03:00
Joonas Rikkonen	6dc3e64bf5	(fba51acd3) Fixed: Mechanic tutorial getting stuck if repairing the broken pump before the leaks are repaired	2019-06-09 17:39:32 +03:00
Joonas Rikkonen	45e05f7c4b	(0fe4c8adb) Fixed server ignoring the max players value set in the "host server" menu	2019-06-09 17:39:14 +03:00
Joonas Rikkonen	a70319bbd2	(97e5bb5d1) Don't show the "kick / vote to kick" buttons when inspecting the owner of the server, or display the "x voted to kick" message if someone tries to vote kick the owner.	2019-06-09 17:38:20 +03:00
Joonas Rikkonen	c4584f7763	(d5505ed3d) Show the name of the server in the "connecting to..." popup instead of the IP address	2019-06-04 16:52:07 +03:00
Joonas Rikkonen	2b7649bd2b	(44694344e) Don't allow deleting vanilla subs in the sub editor	2019-06-04 16:44:10 +03:00
Joonas Rikkonen	43dcc98b8e	(9adead624) Add source rect nudging in the sprite editor (move the source rect position with the arrows).	2019-06-04 16:43:52 +03:00
Joonas Rikkonen	bea7b58ff3	(a410fd46c) Trying to help the merge script through a jungle of merges	2019-06-04 16:37:31 +03:00
Joonas Rikkonen	babc87903b	(f9330e2e0) Modified: MacOS to use the same monokickstart when launching server	2019-06-04 16:03:35 +03:00
Joonas Rikkonen	8184f0e6f6	(6b3ca1aae) Fixed the "item in use by x" text not being visible in item interfaces	2019-06-04 16:03:00 +03:00
Joonas Rikkonen	aaa945ded8	(0f1d327f0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev	2019-06-04 16:02:42 +03:00
Joonas Rikkonen	81dd2f3202	(0c86b4b28) Revert "Don't reset the los if there is no client (single player). Fixes los resetting between game sessions (less tedious debugging)."	2019-06-04 16:02:25 +03:00
Joonas Rikkonen	12ad53297d	(657674526) Reallow changing resolution in fullscreen/borderless. TODO: test, disable in borderless because it seems to do nothing?	2019-06-04 16:00:57 +03:00
Joonas Rikkonen	edccfe223d	(9a7d83a40) Fullscreen bug workarounds	2019-06-04 16:00:38 +03:00
Joonas Rikkonen	012b10d0dc	(a487baf88) Fixed: Formatting	2019-06-04 15:39:07 +03:00
Joonas Rikkonen	e592c49fa8	(221f9f2a6) Merge branch 'dev' into capitalizationfixes	2019-06-04 15:38:31 +03:00
Joonas Rikkonen	f797235bfd	(38d8117f7) Added: More routing of TextManager.Get().Replace -> TextManager.GetWithVariable(s), missing workshop-related localization tags to englishvanilla	2019-06-04 15:38:12 +03:00
Joonas Rikkonen	1a011971d0	(49ace9e7f) Removed unused field from CreditsPlayer	2019-06-04 15:36:03 +03:00
Joonas Rikkonen	bc566ac0e7	(bc44f3622) Fixed credits not resizing when resolution is changed	2019-06-04 15:32:04 +03:00
Joonas Rikkonen	93e4767fb8	(657674526) Reallow changing resolution in fullscreen/borderless. TODO: test, disable in borderless because it seems to do nothing?	2019-06-04 15:30:32 +03:00
Joonas Rikkonen	bce99f2e6f	(7e0adb991) Fixed legacy items failing to load if a sub is saved with a language other than English and the language then changed to something else.	2019-06-04 15:29:55 +03:00
Joonas Rikkonen	ebd916e95c	(9a7d83a40) Fullscreen bug workarounds	2019-06-04 15:29:36 +03:00
Joonas Rikkonen	304db988b1	(b63c9bf0c) Fixed OpenFileDialog not closing on Linux	2019-05-23 17:04:30 +03:00
Joonas Rikkonen	950425174d	(7aea3c20b) Fixed subs with the HideInMenus tag being hidden in debug builds but not in release builds (instead of the other way around)	2019-05-23 15:15:30 +03:00
Joonas Rikkonen	cddc049a6a	(c0e610a99) Ugly temporary workaround to OpenFileDialog crashing on some Linux systems. If instantiating the dialog fails, a message box pops up where the user can enter the path to the file manually.	2019-05-23 15:14:34 +03:00
Joonas Rikkonen	80a3a26fcd	(eb8bec90d) Use RestSharp to download workshop preview images (WebClient seems to be unreliable on Linux & Mac)	2019-05-23 15:14:17 +03:00
Joonas Rikkonen	88605bd060	(f95a5142b) Fixed: Game crashing when clicking on the 'No matchign servers found.' message in server list	2019-05-23 15:13:02 +03:00
Joonas Rikkonen	60c85a19f3	(511dc4358) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev	2019-05-23 15:12:44 +03:00
Joonas Rikkonen	ebd215df53	(6c4495e04) Fixed: Mechanic cabinet highlighting before deconstructing	2019-05-23 15:12:26 +03:00
Joonas Rikkonen	c237ffa982	(8a1744511) Removed duplicate swarm description. Closes #1490	2019-05-23 15:12:08 +03:00
Joonas Rikkonen	2a20b68f3c	(33a87d5c8) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev	2019-05-23 15:11:49 +03:00
Joonas Rikkonen	b6a0cd3871	(7a85fb03d) Added: Possibility to access any tutorial in a debug build	2019-05-23 15:11:31 +03:00
Joonas Rikkonen	cd5d81c3f1	(e8befa230) Added: Unlocking of tutorials one by one. Fixed: EngineerTutorial's submarine reactor not starting properly in the off-state	2019-05-23 15:09:42 +03:00
Joonas Rikkonen	7c67b1f164	(57c46943d) Quick fix watchman graphics (not quite right yet, but better). Re-enable the variant 2.	2019-05-20 21:00:11 +03:00
Joonas Rikkonen	b71adc7589	(2e0e45e1f) Updated: Localization	2019-05-20 20:46:21 +03:00
Joonas Rikkonen	dfa584c2c5	(0b650589c) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev	2019-05-18 21:51:29 +03:00
Joonas Rikkonen	50f379086c	(3b88adb46) Added: Highlighting to player health bar before the health interface has been opened for the first time	2019-05-18 21:51:12 +03:00
Joonas Rikkonen	1dc6dc861e	(3d6f5e573) Improved text positioning in the campaign UI crew/store/repair buttons	2019-05-18 21:50:54 +03:00
Joonas Rikkonen	eed0666879	(76909c3c7) Fixed "clowncostume" and "crewaway" achievements not unlocking in multiplayer, fixed being able to get the "killclown" achievement by committing suicide while wearing a clown costume. Closes #1478 ... + merge fix	2019-05-18 18:24:03 +03:00
Joonas Rikkonen	e17c8e5acb	(1df765f1d) Set text displays inside outposts to be hidden in game	2019-05-18 18:22:06 +03:00
Joonas Rikkonen	0021a71d2d	(4112b048e) Convert the name of the currently selected capture device to UTF8 in the settings menu, not just the available capture device names	2019-05-18 17:56:16 +03:00
Joonas Rikkonen	896dd9469c	(b13f5d345) If the "mysteries lie ahead" text that pops up when clicking the location at the center of the map is not available in the selected language, show the campaign roadmap (which mentions the center location not being reachable) instead	2019-05-18 17:55:58 +03:00
Joonas Rikkonen	d06870c82a	(05888a162) Added missing display name to alien coil's "activate" connection	2019-05-18 17:55:40 +03:00
Joonas Rikkonen	305fa484ad	(3e2eaf696) Fixed "mission failed" text still appearing in other languages due to TextManager automatically returning an English text if a text cannot be found in the selected language	2019-05-18 17:55:21 +03:00
Joonas Rikkonen	8fec6cae81	(bf3994d49) Fixed save time being displayed in UNIX time in the right-hand panel in the campaign setup UI	2019-05-18 17:55:03 +03:00
Joonas Rikkonen	f0d8186c69	(fc5c8644d) Automatically enable user statistics if the "do you want to send statistics" prompt cannot be shown on the selected language	2019-05-18 17:54:46 +03:00
Joonas Rikkonen	c44d64df1b	(a08a47a7f) Readded: Interval based reporting after entering the sub	2019-05-18 17:54:28 +03:00
Joonas Rikkonen	1146ecf3f3	(73fb25a43) Fixed: AI medic reporting by faking the reports	2019-05-18 17:54:12 +03:00
Joonas Rikkonen	c7efdbb0e3	(97afc6f16) Fixed: SubPatients list not cleared when restarting	2019-05-18 17:53:54 +03:00
Joonas Rikkonen	d36669c607	(7f6b8d538) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev	2019-05-18 17:53:38 +03:00