10746 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michał Janiszewski	cb1911280a	Don't crash if path to RCT2 is NULL ... This can happen when `game_path` entry gets removed from `config.ini`	2017-01-28 21:31:33 +01:00
Michał Janiszewski	404fceaed9	Guard against invalid fence better	2017-01-28 21:04:08 +01:00
Duncan	f2d0b58908	Merge pull request #5129 from duncanspumpkin/minor_refactor ... Minor refactor of track design to label enums	2017-01-28 18:26:57 +00:00
duncanspumpkin	3633b86405	Minor refactor of track design to label enums	2017-01-28 09:28:11 +00:00
OpenRCT2 git bot	661ebbd997	Merge Localisation/master into OpenRCT2/develop.	2017-01-28 04:00:23 +00:00
Michał Janiszewski	0e7c94d98a	Guard fence from null entry ... Allows loading http://www.nedesigns.com/park/3626/mediterranean-mysteries/	2017-01-28 00:12:49 +01:00
Michał Janiszewski	834cee311b	Fix typos in RCT1-related code	2017-01-27 22:13:49 +01:00
Michał Janiszewski	51523df50a	Fix left-shifts in research.c	2017-01-27 21:46:10 +01:00
Ted John	233a3040e1	Merge pull request #5007 from IntelOrca/feature/rct1/import-vehicles ... RCT1: import vehicles	2017-01-27 07:49:20 +00:00
Michał Janiszewski	6bd9e3eca8	Make sure various fields are initialised properly	2017-01-27 07:35:48 +01:00
OpenRCT2 git bot	8d56821f56	Merge Localisation/master into OpenRCT2/develop.	2017-01-27 04:00:18 +00:00
Gymnasiast	24b546b789	Fix import of peep sprites	2017-01-27 00:50:49 +01:00
Ted John	e115227c08	Sort includes	2017-01-26 23:36:33 +00:00
Ted John	b5505c9fc9	Improve function names	2017-01-26 23:36:21 +00:00
Ted John	f019aa5db5	Remove commented out code	2017-01-26 23:35:01 +00:00
Ted John	f3fc09cb9a	Fix switch brace syntax	2017-01-26 23:32:46 +00:00
Ted John	62d1d55ed5	Update changelog	2017-01-26 23:31:35 +00:00
Ted John	438926c08c	Protect ride_mechanic_status_update from null mechanic	2017-01-26 23:30:16 +00:00
Gymnasiast	2da90b9808	Fix erroneous messages about stalling	2017-01-26 23:30:16 +00:00
Ted John	c24127bafe	Fix loading scenario details from SV4	2017-01-26 23:30:16 +00:00
Gymnasiast	c92792a973	Also import news items in S4 files correctly	2017-01-26 23:30:16 +00:00
Gymnasiast	6d8a617712	Count block sections when importing an SC4/SV4 file	2017-01-26 23:30:16 +00:00
Gymnasiast	a7e91ad556	Use the actual scenario number in the S4 file rather than the file name	2017-01-26 23:30:16 +00:00
Gymnasiast	bd68624c92	Fix unbuyable land tiles in Katie's Dreamland	2017-01-26 23:30:16 +00:00
Gymnasiast	84754ec30f	Correctly import Heide-Parks Compact Inverted Coaster	2017-01-26 23:30:16 +00:00
Gymnasiast	585e28b67f	Temporarily fix non-ascii import	2017-01-26 23:30:16 +00:00
Gymnasiast	e621cd37cc	Fix mechanics facing the wrong direction	2017-01-26 23:30:16 +00:00
Ted John	1cb6dbbe1f	Convert RCT1 strings to UTF-8	2017-01-26 23:30:16 +00:00
Ted John	67b668c54e	Use spite_move when importing misc sprites	2017-01-26 23:30:16 +00:00
Ted John	1a5bec7846	Fix and refactor sprite index mapping	2017-01-26 23:30:16 +00:00
Gymnasiast	79f9cf611d	Guard better against incorrect subtypes	2017-01-26 23:30:16 +00:00
Gymnasiast	91c3b5c592	Fix lifecycle flags import	2017-01-26 23:30:16 +00:00
Gymnasiast	d476176d73	Import more fields, name mechanic flags, fix booster behaviour	2017-01-26 23:30:16 +00:00
Gymnasiast	39d413b781	Fix Megaworld Park crashing on opening, fix some colour schemes	2017-01-26 23:30:16 +00:00
Gymnasiast	476f1fad2b	Use constants for null sprite location and maximum vehicles	2017-01-26 23:30:16 +00:00
Gymnasiast	02da9caf5d	Fix formatting and remove warning silencer	2017-01-26 23:30:16 +00:00
Gymnasiast	803c4ddfe5	Fix minigolf import	2017-01-26 23:30:16 +00:00
Gymnasiast	653be68b98	Don't assert on incorrect colour or sprite type	2017-01-26 23:30:16 +00:00
Gymnasiast	69a79fd00a	Import water colour	2017-01-26 23:30:16 +00:00
Gymnasiast	3d0c357fbf	Fix vehicle direction	2017-01-26 23:30:16 +00:00
Michael Steenbeek	b47694a9f7	Fix typo	2017-01-26 23:30:16 +00:00
Gymnasiast	54c4f0f1f3	Fix import of more vehicles, fix some colours	2017-01-26 23:30:16 +00:00
Gymnasiast	cc4576b72a	Fix colour lookup for vehicle sprites	2017-01-26 23:30:16 +00:00
Gymnasiast	51c812458e	Extract colour lookup functions	2017-01-26 23:30:16 +00:00
Gymnasiast	d077cd1341	Create table for converting colour schemes, fix some vehicles, fix river rapids	2017-01-26 23:30:16 +00:00
Gymnasiast	63d639db5d	Fix negative queue lengths, fix monorail, fix chairlift crashes	2017-01-26 23:30:16 +00:00
Ted John	c1d532be01	Fix colour conversion out of range	2017-01-26 23:30:16 +00:00
duncanspumpkin	e3e435c9f7	Fix trains splitting up into multiple vehicles	2017-01-26 23:30:16 +00:00
Gymnasiast	dacfba9eda	Import more fields, correct more vehicles	2017-01-26 23:30:16 +00:00
Gymnasiast	fc7b03747e	Import ride measurements (with bugs)	2017-01-26 23:30:16 +00:00