1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00
Commit Graph

6294 Commits

Author SHA1 Message Date
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 v0.0.3 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
Hielke Morsink
666da74beb Changed missleading variable name from 'filename' to 'path'. 2015-11-29 19:59:15 +01:00
Hielke Morsink
5b1d93805d More consistent use between name and paths. Improved path_get_* functions. 2015-11-29 19:41:06 +01: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
Hielke Morsink
02349d2463 Using platform_get_path_separator for getting the filename now 2015-11-29 17:01:41 +01:00
Hielke Morsink
415f55d38d Removed '.TD6' part from being added automatically when saving a new track 2015-11-29 16:45:02 +01:00
Hielke Morsink
5ca371c5c5 Displaying full track filename excluding the real extension 2015-11-29 16:36:46 +01:00
Hielke Morsink
63184052be minor optimizations and added comments to some util functions 2015-11-29 16:00:15 +01: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
Michał Janiszewski
b4b1624e08 Set path properly for OS X 2015-11-29 15:29:35 +01:00
Duncan
d00c124e52 Merge pull request #2364 from janisozaur/memory
Plug memory leaks, check memory accesses
2015-11-29 11:27:13 +00:00
Michał Janiszewski
ed21aeb3fc Take care of strings in POSIX platform file 2015-11-29 12:19:13 +01:00
Michał Janiszewski
39cc16d137 Plug memory leaks, check memory accesses 2015-11-29 12:15:47 +01:00
Duncan
ada46ccc80 Merge pull request #2386 from LinusU/osx-platform
OS X platform
2015-11-29 11:10:35 +00:00
Duncan
ff0dc03671 Merge pull request #2393 from OpenRCT2/Gymnasiast-changelog
Fix typo in changelog
2015-11-28 16:00:19 +00:00
Michael Steenbeek
767333f0b4 Fix typo in changelog 2015-11-28 16:46:09 +01:00
Ted John
25552486dc Merge pull request #2391 from OpenRCT2/Gymnasiast-changelog
Update changelog.txt
2015-11-28 12:34:51 +00:00
Michael Steenbeek
60719da852 Update changelog.txt 2015-11-28 13:33:23 +01:00
IntelOrca
cf1961b725 fix #2385: Parks created with scenario editor do not have correct initial temperature 2015-11-28 12:24:19 +00:00
IntelOrca
7909ba1f3b fix #2390: Not fully implemented UTF-8 currencies in building/landscaping/etc. 2015-11-28 12:10:17 +00:00
Linus Unnebäck
859684142a OS X platform implementation 2015-11-28 10:40:58 +01:00
Sam Parkinson
4eb55ac156 [Linux] Use system ca certs bundle
Curl automatically has a certs bundle on GNU/Linux, so providing
our own is not needed.
2015-11-28 10:56:23 +11:00
IntelOrca
c6056cbb6c Merge branch 'pre-release-0.0.3' into develop
Conflicts:
	src/audio/audio.c
2015-11-27 22:05:40 +00:00
duncanspumpkin
843999997b Fix #2375. Issue caused by invalid z coordinate for invalidate.
Also fixed a couple other functions which were calling with the incorrect z value
2015-11-27 19:17:35 +00:00
Ted John
7fc8b453d6 Merge pull request #2387 from duncanspumpkin/fix_2381
Map animation invalidate now called during pause mode
2015-11-27 18:56:26 +00:00