duncanspumpkin 2bd6dac20f Merge branch 'develop' into vehicle-update ...

Conflicts:
 openrct2.vcxproj

2016-01-10 08:57:41 +00:00

..

balloon.c

Clean up the comments a litte

2015-12-11 16:19:46 -06:00

banner.c

Clean up the comments a litte

2015-12-11 16:19:46 -06:00

banner.h

Fixed extern and enum name usage

2015-12-16 14:48:27 -06:00

climate.c

Fixed extern and enum name usage

2015-12-16 14:48:27 -06:00

climate.h

Fixed extern and enum name usage

2015-12-16 14:48:27 -06:00

duck.c

Clean up the comments a litte

2015-12-11 16:19:46 -06:00

entrance.h

Added newlines at end of files

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

footpath.c

Getting path scenery type and index using helper functions throughout the entire project.

2016-01-01 21:28:53 +01:00

footpath.h

Getting path scenery type and index using helper functions throughout the entire project.

2016-01-01 21:28:53 +01:00

fountain.c

Getting path scenery type and index using helper functions throughout the entire project.

2016-01-01 21:28:53 +01:00

fountain.h

Strip all whitespace

2015-10-20 20:48:51 +02:00

map_animation.c

Clean up the comments a litte

2015-12-11 16:19:46 -06:00

map_animation.h

Added newlines at end of files

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

map_helpers.c

Added newlines at end of files

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

map_helpers.h

Added newlines at end of files

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

map.c

Merge branch 'develop' into vehicle-update

2016-01-10 08:57:41 +00:00

map.h

Merge branch 'develop' into vehicle-update

2016-01-05 09:59:53 +01:00

mapgen.c

Implement util_rand due to rand having a poor range on some platforms

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

mapgen.h

Added newlines at end of files

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

money_effect.c

Clean up the comments a litte

2015-12-11 16:19:46 -06:00

park.c

Game commands hardening

2016-01-04 22:03:28 +01:00

park.h

Strip all whitespace

2015-10-20 20:48:51 +02:00

particle.c

Merge sub_6DAB4C into vehicle-update

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

scenery.c

Getting path scenery type and index using helper functions throughout the entire project.

2016-01-01 21:28:53 +01:00

scenery.h

Printing path and addition names in tile inspector.

2016-01-01 21:28:48 +01:00

sprite.c

Merge branch 'develop' into vehicle-update

2016-01-05 09:59:53 +01:00

sprite.h

Merge branch 'develop' into vehicle-update

2016-01-05 09:59:53 +01:00

water.h

Added newlines at end of files

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