Michał Janiszewski 5f66cd48f8 Merge branch 'develop' into vehicle-update ...

Conflicts:
	openrct2.vcxproj.filters

2015-12-31 11:41:23 +01:00

..

cable_lift.c

Labelled remaining_distance. Relabelled acceleration/powered acceleration

2015-12-20 21:36:11 +00:00

cable_lift.h

Labelled remaining_distance. Relabelled acceleration/powered acceleration

2015-12-20 21:36:11 +00:00

ride_data.c

Merge branch 'develop' into vehicle-update

2015-12-31 11:41:23 +01:00

ride_data.h

Merge branch 'develop' into vehicle-update

2015-12-31 11:41:23 +01:00

ride_ratings.c

Merge sub_6DAB4C into vehicle-update

2015-12-14 21:56:00 +00:00

ride_ratings.h

Added newlines at end of files

2015-12-20 22:03:37 -06:00

ride.c

Merge branch 'develop' into vehicle-update

2015-12-31 11:41:23 +01:00

ride.h

Merge branch 'develop' into vehicle-update

2015-12-31 11:41:23 +01:00

station.c

Fix restraint issue.

2015-12-05 10:49:06 +00:00

station.h

Added newlines at end of files

2015-12-20 22:03:37 -06:00

track_data.c

refactor new track painter, reduce empty jump tables

2015-12-19 12:39:07 +00:00

track_data.h

refactor new track painter, reduce empty jump tables

2015-12-19 12:39:07 +00:00

track_paint.c

Merge branch 'develop' into vehicle-update

2015-12-22 14:57:40 +01:00

track_paint.h

Added newlines at end of files

2015-12-20 22:03:37 -06:00

track.c

Merge branch 'develop' into vehicle-update

2015-12-31 11:41:23 +01:00

track.h

Merge sub_6DAB4C into vehicle-update

2015-12-14 21:56:00 +00:00

vehicle.c

Fix flying boats when entering the station.

2015-12-31 10:27:33 +00:00

vehicle.h

Added newlines at end of files

2015-12-20 22:03:37 -06:00