404 Commits

Author	SHA1	Message	Date
Gymnasiast	4fa571a041	Add option to allow loading scenarios with an incorrect checksum	2015-08-18 10:47:31 +02:00
Ted John	3a8dd25020	Merge Localisation/master into OpenRCT2/develop.	2015-08-18 04:00:15 +01:00
Ted John	e46cc379ab	Merge pull request #1803 from medsouz/handymenmowdefault ... Add option for handymen to mow grass by default	2015-08-17 08:05:18 +01:00
Ted John	00ab8be6af	Merge Localisation/master into OpenRCT2/develop.	2015-08-17 04:00:16 +01:00
medsouz	3b845a67ed	Add option for handymen to mow grass by default	2015-08-16 19:26:42 -04:00
xperia64	a629de4666	Correct String IDs	2015-08-16 16:03:23 -04:00
xperia64	4733ea28c0	Add a cheat so guests ignore intensity and nausea ratings	2015-08-16 16:02:41 -04:00
IntelOrca	094cc19411	allow joining of servers in server list window	2015-08-16 16:37:08 +01:00
Gymnasiast	c00e044b6c	Multiplayer interface improvements, cleanup	2015-08-16 13:14:04 +02:00
Ted John	905efcd412	Merge Localisation/master into OpenRCT2/develop.	2015-08-16 04:00:15 +01:00
IntelOrca	f072440d18	add server list window (WIP)	2015-08-16 03:07:00 +01:00
IntelOrca	3f31221973	fix network merge issues, fix #1785	2015-08-14 22:06:15 +01:00
zsilencer	d772f8b5fb	measure and display ping	2015-08-14 09:13:39 -06:00
zsilencer	7ccb0eb655	basic player list	2015-08-14 09:13:38 -06:00
IntelOrca	99f2b87043	add chat feature	2015-08-14 09:13:29 -06:00
Ted John	80281e82ea	Merge pull request #1778 from Gymnasiast/patch-2 ... Mark former tutorial strings as unused	2015-08-14 13:57:15 +01:00
Ted John	e9c8d03bd9	Merge Localisation/master into OpenRCT2/develop.	2015-08-14 04:00:15 +01:00
Michael Steenbeek	5ee6d563d0	Mark former tutorial strings as unused	2015-08-13 10:40:37 +02:00
Ted John	76df9b156a	Merge Localisation/master into OpenRCT2/develop.	2015-08-13 04:00:15 +01:00
Gymnasiast	d01a53bd16	Add Inventions List and Scenario Options to the Debug menu	2015-08-12 15:31:52 +02:00
Ted John	16653b6f9f	Merge Localisation/master into OpenRCT2/develop.	2015-08-12 04:00:14 +01:00
medsouz	e0e9dedb8b	Moved strings to english_uk.txt	2015-08-11 07:30:29 -04:00
medsouz	db9ea4cdf3	Added toggle for audio disable on focus lost ... This closes #1758	2015-08-11 07:06:00 -04:00
LRFLEW	d10f5c8f06	Added tracked guests filter	2015-08-09 22:58:15 -05:00
Ted John	7395752ddf	Merge Localisation/master into OpenRCT2/develop.	2015-08-10 04:00:15 +01:00
Ted John	5ae099c062	Merge Localisation/master into OpenRCT2/develop.	2015-08-08 04:00:15 +01:00
Ted John	2a9698c7c2	Merge Localisation/master into OpenRCT2/develop.	2015-08-07 04:00:14 +01:00
Ted John	b081f27a92	Merge Localisation/master into OpenRCT2/develop.	2015-08-06 04:00:15 +01:00
IntelOrca	19f94b54e1	fix #1669	2015-08-05 13:44:47 +01:00
IntelOrca	cec486839c	add 'no entrance' style and refactor a few things	2015-08-05 01:24:18 +01:00
danidoedel	1fc7c0ecac	fix recent messages toolbar tooltip	2015-08-04 17:56:12 +02:00
IntelOrca	d228d13918	implement utf8, part 23 (bug fixes)	2015-08-01 16:40:15 +01:00
IntelOrca	31eb758ba1	implement utf8, part 15	2015-08-01 10:20:57 +01:00
Ted John	c389228141	Merge Localisation/master into OpenRCT2/develop.	2015-08-01 04:00:15 +01:00
Ted John	192289de87	Merge Localisation/master into OpenRCT2/develop.	2015-07-30 04:00:13 +01:00
Michael Steenbeek	e16b6fb2d0	GB: Fix use of American English	2015-07-29 08:46:32 +02:00
Ted John	8282802574	Merge Localisation/master into OpenRCT2/develop.	2015-07-29 04:00:14 +01:00
Ted John	ea130a6126	Merge pull request #1694 from Gymnasiast/remove-six-flags-branding-and-limitations-2 ... Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag	2015-07-28 12:08:47 +01:00
Gymnasiast	9976b9673a	Remove rest of Six Flags branding.	2015-07-28 10:13:16 +02:00
Ted John	c35d1ce65f	Merge Localisation/master into OpenRCT2/develop.	2015-07-28 04:00:14 +01:00
Gymnasiast	5ed8948e4f	Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag	2015-07-27 21:47:55 +02:00
Gymnasiast	65900982c4	Fix '1 weeks remaining'	2015-07-27 17:33:22 +02:00
Duncan	cfb8f3ae0a	Merge pull request #1691 from Gymnasiast/more-obsolete-strings ... Mark more obsolete strings	2015-07-27 12:23:30 +01:00
Gymnasiast	38f031655c	Fix display of remaining marketing campaign weeks	2015-07-27 10:34:19 +02:00
Gymnasiast	c2fe82dcb7	Mark more obsolete strings	2015-07-27 10:16:08 +02:00
Ted John	0ef9627058	Merge Localisation/master into OpenRCT2/develop.	2015-07-27 04:00:15 +01:00
Ted John	30ee1096b7	Merge pull request #1684 from Gymnasiast/longer-marketing-campaigns-squash ... Allow running marketing campaigns for up to 12 weeks	2015-07-26 21:48:39 +01:00
Gymnasiast	777065e6a6	Allow running marketing campaigns for up to 12 weeks	2015-07-26 22:36:12 +02:00
Ted John	8bfdbdec65	Merge pull request #1687 from Gymnasiast/fix-intro-option ... Remove Infogrames disclaimer from intro and fix config option	2015-07-26 21:33:26 +01:00
Matt Layher	06f2adb9d6	Properly merge #1672: incorrect plural form for last inspection time, fixes #1513, closes #1672	2015-07-26 21:30:29 +01:00