4463 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
IntelOrca	88db4f12aa	fix #1910	2015-09-09 20:25:34 +01:00
IntelOrca	289555c082	fix #1908	2015-09-09 19:22:41 +01:00
Ted John	f271bc0721	Update .travis.yml	2015-09-09 18:27:01 +01:00
Ted John	7c81d6b38c	Update readme.md	2015-09-09 18:25:48 +01:00
Ted John	acf27afb3e	Merge pull request #1907 from OpenRCT2/language-dat ... Localisation for objects and scenarios.	2015-09-09 17:50:33 +01:00
Ted John	7d6291ad26	Merge pull request #1906 from janisozaur/language-dat ... fix travis builds by forcing it to ubuntu 14.04	2015-09-09 08:20:46 +01:00
Michał Janiszewski	cc6832cf48	fix travis builds by forcing it to ubuntu 14.04 ... This (for now) will force Travis' hand to use ubuntu 14.04 which has mingw 4.8 available. It is enough to compile the project as it stands.	2015-09-09 09:08:28 +02:00
Ted John	d7a7a81cd0	Merge Localisation/master into OpenRCT2/develop.	2015-09-09 04:00:15 +01:00
IntelOrca	fddf057d68	add scenario overrides	2015-09-08 21:37:25 +01:00
Gymnasiast	188978936b	Fix Math.Clamp definition	2015-09-08 21:37:24 +01:00
IntelOrca	fc65a92275	fix object override strings for scenario editor and plugin.dat	2015-09-08 21:37:24 +01:00
IntelOrca	fe7879f0a3	add capacity overriding	2015-09-08 21:37:23 +01:00
IntelOrca	34cd6a9242	fix GCC compile issue	2015-09-08 21:37:22 +01:00
IntelOrca	8085abadd3	add basic support for localisation object string overriding	2015-09-08 21:37:22 +01:00
IntelOrca	7a0478404e	add new C++ memory utility functions	2015-09-08 21:37:21 +01:00
IntelOrca	952a4abdd1	implement DAT translation, part 1	2015-09-08 21:37:20 +01:00
IntelOrca	8ec51b6fc1	add FileStream, IStream and IDisposable	2015-09-08 21:37:20 +01:00
Ted John	2a0366721e	Merge pull request #1896 from janisozaur/some_fixes ... assorted fixes	2015-09-07 20:11:29 +01:00
Michał Janiszewski	52252f82b3	assorted fixes	2015-09-07 20:51:21 +02:00
IntelOrca	f2beefb33b	fix #1886	2015-09-07 18:43:31 +01:00
IntelOrca	af39fcd35f	fix #1873	2015-09-07 18:18:52 +01:00
IntelOrca	72000196dd	use English UK DAT strings instead of RCT2 Korean strings until fix or workaround is available #1898	2015-09-07 17:35:39 +01:00
Ted John	1a5a4d2e05	Merge pull request #1897 from Gymnasiast/fix-warnings ... Fix some warnings	2015-09-07 17:20:06 +01:00
Gymnasiast	3ddddec21c	Fix some warnings	2015-09-07 14:57:39 +02:00
Ted John	a0d684a07d	Merge Localisation/master into OpenRCT2/develop.	2015-09-07 04:00:15 +01:00
IntelOrca	efada641a5	implement map_place_fence_check_obstruction	2015-09-06 17:36:55 +01:00
IntelOrca	2753af893b	implement map_obstruction_set_error_text	2015-09-06 13:37:00 +01:00
IntelOrca	ed824d36b0	refactor two CALLPROC functions in track.c	2015-09-05 20:34:56 +01:00
IntelOrca	8c44ddac17	fix 2nd problem of #1848	2015-09-05 20:06:58 +01:00
IntelOrca	c3fbdf78c0	fix writing null terminators in config file	2015-09-05 19:32:01 +01:00
IntelOrca	85181b5ed3	add stay_connected config option	2015-09-05 18:46:13 +01:00
IntelOrca	6901c04f24	implement track_save_add_map_element and track_save_remove_map_element	2015-09-05 18:21:36 +01:00
IntelOrca	7228e42768	implement litter_remove_at	2015-09-05 13:59:12 +01:00
IntelOrca	e136923437	fix #1890	2015-09-05 13:18:31 +01:00
Ted John	54b08da98e	Merge Localisation/master into OpenRCT2/develop.	2015-09-05 04:00:15 +01:00
Ted John	28d1a62544	Merge pull request #1891 from Gymnasiast/remove-unused-var ... Remove unused variable	2015-09-04 20:31:33 +01:00
Gymnasiast	87eb6335ea	Remove unused variable	2015-09-04 15:10:09 +02:00
Ted John	4c60112bd5	Merge Localisation/master into OpenRCT2/develop.	2015-09-04 04:00:15 +01:00
IntelOrca	42cc5555be	add Korean language descriptor	2015-09-03 19:57:24 +01:00
Ted John	7b4f6e7008	Merge pull request #1889 from Gator96100/develop ... Added support for hostnames	2015-09-03 19:13:56 +01:00
Gator96100	c3ffd221de	Added support for hostnames	2015-09-03 19:49:14 +02:00
Ted John	18bb8b9bb0	Merge pull request #1888 from Gymnasiast/fix-1877 ... Take on-ride photos into account when calculating profit per hour, fixes #1877	2015-09-03 17:45:14 +01:00
Gymnasiast	feebb7b39d	Take on-ride photos into account when calculating profit per hour, fixes #1877	2015-09-03 15:08:33 +02:00
Ted John	28a66f1d81	Merge pull request #1887 from Gymnasiast/improve-install ... Only force installation on Travis	2015-09-03 12:42:58 +01:00
Gymnasiast	7afae59150	Only force installation on Travis	2015-09-03 13:38:21 +02:00
Ted John	e6f1b6cd38	Merge pull request #1883 from Gymnasiast/fix-1870 ... Check if the game is in title sequence mode before loading it, fixes #1870	2015-09-03 12:17:45 +01:00
Gymnasiast	2729531e0e	Cleaner fix	2015-09-03 13:13:50 +02:00
Ted John	081ebeccf4	Merge pull request #1881 from zsilencer/develop ... disable naggle	2015-09-03 12:01:40 +01:00
Ted John	2975cb7038	Merge pull request #1885 from Gymnasiast/fix-1493 ... Keep track list responsive in pause mode, fixes #1493	2015-09-03 11:56:14 +01:00
Gymnasiast	d849e3378c	Keep track list responsive in pause mode, fixes #1493	2015-09-03 12:12:21 +02:00