Commit graph

5360 commits

Author SHA1 Message Date
Ted John
4ed7a3496e Merge pull request #2347 from Gymnasiast/default-measurement-system
Change fallback measurement system to metric.
2015-12-05 13:32:07 +00:00
Ted John
8e3bfb7a58 Merge pull request #2409 from Gymnasiast/track-designs-manager-close
Add close button to track designs manager, closes #1807
2015-12-05 13:31:31 +00:00
IntelOrca
b1bb72c833 Merge branch 'master' into develop
Conflicts:
	src/rct2.h
2015-12-04 21:16:43 +00:00
IntelOrca
673796eb6c Merge branch 'pre-release-0.0.3.1' 2015-12-04 21:09:43 +00:00
Sam Parkinson
b9ba20a399 Implement CTRL-Backspace shortcut for clearing inputs, fixes #2355 2015-12-05 06:56:39 +11:00
IntelOrca
8e6c345be6 prepare distribution files for pre-release-0.0.3.1 2015-12-04 19:09:05 +00:00
IntelOrca
9c19d689c2 fix #2434: Dropdown menus linger when toolbars are toggled 2015-12-04 19:02:24 +00:00
IntelOrca
737baf8b78 fix #2158: Video Freeze when window is maximised, minimised and then restored 2015-12-04 18:59:59 +00:00
duncanspumpkin
11398cf60f Fix warning. 2015-12-04 16:57:43 +00:00
Ted John
8d971d3e0e Merge Localisation/master into OpenRCT2/develop. 2015-12-03 04:00:17 +00:00
xperia64
562d7fdb61 Add symbolic link support 2015-12-03 00:20:04 +00:00
duncanspumpkin
8eb313f852 Fix #2417 also fixed some surface pathfinding bugs.
Guests were ignoring fences when surface pathfinding even when there was an available exit. Missing &= 3 was causing the assert to trigger.
2015-12-02 18:59:00 +00:00
IntelOrca
594f3d3c74 add new cache file to .gitignore (introduced in VS2015 Update 1) 2015-12-02 17:53:01 +00:00
IntelOrca
9426170918 fix #2425: ride campaign list corrupted if over 40 rides 2015-12-02 17:50:32 +00:00
Michał Janiszewski
796021cfdc fix suspicious left shifts
See b5b1957f5
2015-12-02 08:32:15 +01:00
Ted John
abfc025c5a Merge Localisation/master into OpenRCT2/develop. 2015-12-02 04:00:19 +00:00
Michał Janiszewski
d1b6d175c7 Make each platform set its own exe path 2015-12-01 21:38:35 +01:00
IntelOrca
60300dcece update version and branch 2015-12-01 18:30:04 +00:00
IntelOrca
8de299cc06 fix #2415: day / night cycle not working 2015-12-01 18:26:02 +00:00
IntelOrca
b41b225673 Merge pull request #2414 from Broxzier/fix_save_prompt 2015-12-01 18:24:28 +00:00
Hielke Morsink
65a0dcbc8a Fixed #2407 - Prevent prompt from showing shortly after loading a second park. 2015-12-01 18:21:47 +00:00
Gymnasiast
3f6990dac9 Add close button to track designs manager, closes #1807 2015-11-30 22:53:28 +01:00
Duncan
396e6f8fee Merge pull request #2297 from osconnoisseur/decompile-map_set_land_height
Decompilation of map_set_land_height
2015-11-30 20:35:50 +00:00
duncanspumpkin
1a9b96340c Merge OpenRCT2/master into OpenRCT2/develop 2015-11-30 18:55:32 +00:00
duncanspumpkin
93e0bc5a24 Merge OpenRCT2/pre-release-0.0.3 into OpenRCT2/master 2015-11-30 18:53:57 +00:00
IntelOrca
42f5004406 Merge Localisation/master into OpenRCT2/pre-release-0.0.3. 2015-11-30 18:50:39 +00:00
IntelOrca
6da5018455 update distribution files for 0.0.3 release 2015-11-30 18:35:32 +00:00
duncanspumpkin
d91a9c965c Fix #2405. Foundations under shops now correctly drawn.
Issue was caused by a mistake in implementation
2015-11-30 18:00:33 +00:00
duncanspumpkin
89f5f53324 Merge branch 'changelog_additions' of https://github.com/e-foley/OpenRCT2 into pre-release-0.0.3 2015-11-30 17:09:35 +00:00
Michael Steenbeek
778aad44a3 Merge pull request #2402 from e-foley/changelog_additions
mention additional changes to original game
2015-11-30 17:05:13 +01:00
e-foley
115a924e5a misc proposed log changes 2015-11-30 07:42:29 -08:00
Kevin
c0f7b0b1f3 [Linux] Fix platform_get_locale_currency with new ascii fallback 2015-11-30 13:33:50 +01:00
Kevin
b4907ba70c [Linux] Implement platform_get_locale_currency.
Fix Chinese language codes.
2015-11-30 13:33:50 +01:00
Kevin
3ece04dc8d [Linux] Implement platform_get_locale_measurement_format and platform_get_locale_temperature_format 2015-11-30 13:33:50 +01:00
Kevin
d43bc73e76 [Linux] Implement platform_get_locale_language. 2015-11-30 13:33:50 +01:00
e-foley
88b245e099 add note on staff uniform colors 2015-11-30 00:38:40 -08:00
e-foley
df37433d52 mention additional changes to original game 2015-11-29 21:35:51 -08:00
Ted John
9f61ade4d1 Merge Localisation/master into OpenRCT2/develop. 2015-11-30 04:00:18 +00:00
Duncan
a34f424876 Merge pull request #2397 from Gymnasiast/new-title-sequence
Update title sequence for 0.0.3
2015-11-29 18:19:17 +00:00
Gymnasiast
d985e1d3d7 Update title sequence for 0.0.3
Add three parks, increase some intervals

Adjust one interval

Update title sequence for 0.0.3
2015-11-29 19:10:54 +01:00
IntelOrca
df1f5bad00 fix #604: mute toilet flush sfx on title screen 2015-11-29 17:19:16 +00:00
duncanspumpkin
b9f7f6f4a2 Fix #2395. Fix pressing construct twice 2015-11-29 17:18:42 +00:00
Hielke Morsink
5d489782f7 Added myself to the contributor list. 2015-11-29 17:18:42 +00:00
Hielke Morsink
0909ba8ab4 fixed #2226: resetting screen age when quick saving 2015-11-29 17:18:41 +00:00
duncanspumpkin
4527aa263e Added check to match mechanic fix 2015-11-29 17:18:41 +00:00
duncanspumpkin
cae7b03bdf Fix #1717. Fixes fix ride from failing to fix safety cut out.
As the code to fix rides has not been completed yet it was unknown that safety cutout had so many flags requiring reseting
2015-11-29 17:18:40 +00:00
duncanspumpkin
b1c8275ec0 Disable tracks for networked games until fixed 2015-11-29 17:18:40 +00:00
duncanspumpkin
518b19156a Fix vehicle colours using scenario rand 2015-11-29 17:18:39 +00:00
duncanspumpkin
a4cb2c55d1 Fix ride create on multiplayer using scenario_rand for colour causing desync 2015-11-29 17:18:39 +00:00
Duncan
8274ea1842 Merge pull request #2389 from samdroid-apps/curl-system-certs
[Linux] Use system ca certs bundle
2015-11-29 14:42:50 +00:00