1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 12:03:07 +01:00
Commit Graph

6354 Commits

Author SHA1 Message Date
Gymnasiast
efe73b08dc Fix the file dialog on Linux being case sensitive 2016-02-21 18:28:23 +01:00
duncanspumpkin
f68fe7d24b Fix vehicles disobeying gravity when crashing on certain tracks 2016-02-21 09:40:50 +00:00
OpenRCT2 git bot
9c08d03b0d Merge Localisation/master into OpenRCT2/develop. 2016-02-21 04:00:14 +00:00
Ted John
141221f217 Merge pull request #2986 from Gymnasiast/cc2
Add Chinese currencies, closes #2403, closes #2872
2016-02-20 23:33:51 +00:00
Gymnasiast
d32b7286f5 Adjust string ids 2016-02-21 00:21:14 +01:00
Harry Lam
0453b4a5a6 Add Chinese currencies, closes #2403, closes #2872 2016-02-21 00:13:42 +01:00
IntelOrca
9d15bb1b1f fix #2984: refactor error in ride_shop_connected 2016-02-20 22:51:17 +00:00
IntelOrca
3583d601ad name flag: RIDE_TYPE_FLAG_15 2016-02-20 16:37:09 +00:00
IntelOrca
bd040918a1 use helper functions instead of direct access to 0x00982164 2016-02-20 16:30:08 +00:00
IntelOrca
caf8b45dc3 remove usages of 0x00F441D2 2016-02-20 15:52:38 +00:00
IntelOrca
edbca479e3 remove old usages of 0x00993CCC and 0x00F441D3 2016-02-20 15:50:05 +00:00
IntelOrca
37336d30b7 Merge branch 'develop' of https://github.com/OpenRCT2/OpenRCT2 into develop 2016-02-20 15:17:21 +00:00
Ted John
5182441768 Merge pull request #2968 from octaroot/add_multiplayer_strings
Fix #2802 - extract hardcoded network-related strings
2016-02-20 15:07:53 +00:00
IntelOrca
7cc280ca9f Merge branch 'develop' of https://github.com/OpenRCT2/OpenRCT2 into develop 2016-02-20 14:43:36 +00:00
Ted John
7239921dfa Merge pull request #2980 from JarnoVgr/installerfix
Possible fix for installer upgrade issues
2016-02-20 14:43:14 +00:00
IntelOrca
e4636fd1e5 update .gitignore 2016-02-20 14:40:00 +00:00
Jarno Veuger
513ad15c84 Possible fix for installer upgrade issues 2016-02-20 10:02:05 +01:00
OpenRCT2 git bot
05d66fac25 Merge Localisation/master into OpenRCT2/develop. 2016-02-20 04:00:14 +00:00
IntelOrca
4617a52e53 improve dirty block performance 2016-02-20 00:23:58 +00:00
Ted John
1b6299b9d2 Merge pull request #2976 from janisozaur/rotation-optimise
Optimise accesses to get_current_rotation()
2016-02-19 23:07:03 +00:00
Michał Janiszewski
cafed8551b Optimise accesses to get_current_rotation() 2016-02-19 23:56:08 +01:00
duncanspumpkin
1fb1c69d86 Label more vehicle offsets 2016-02-19 18:15:19 +00:00
duncanspumpkin
60b8407b2b Added assert and error log for questionable localisation code 2016-02-19 17:53:35 +00:00
duncanspumpkin
0e550d8b6b Remove old peep_find_ride_to_look_at code. 2016-02-19 17:51:34 +00:00
Duncan
591611c9f1 Merge pull request #2977 from octaroot/fix_multiplayer_weather_cheat
Fix multiplayer weather cheat
2016-02-19 17:46:38 +00:00
Martin Černáč
4a97743276 Fix multiplayer weather cheat
While refactoring the freeze-climate cheat I noticed the state was not being transmitted over the network. This commit fixes that
2016-02-19 18:23:13 +01:00
Martin Černáč
830b897dc6 Refactor conditional buffers and string_ids 2016-02-19 17:17:10 +01:00
Ted John
4ccd12a5ec Merge pull request #2974 from janisozaur/artifact-names
Rename output files to match Windows' names
2016-02-19 00:10:24 +00:00
Michał Janiszewski
1693f1bb2c Rename output files to match Windows' names 2016-02-19 00:52:08 +01:00
duncanspumpkin
884bcd2c8a Fix #2971. Monorails now correctly accelerate.
Issue was caused by checking the wrong vehicle entry for acceleration speed. This was introduced by a bug fix on the weekend
2016-02-18 22:24:40 +00:00
duncanspumpkin
faf16a35f9 Fix #2972. Station lengths now correctly calculated.
Issue caused by counting number of stations off by one. This would cause the calculator to return 1 even on failure after a station element being removed.
2016-02-18 22:16:51 +00:00
duncanspumpkin
14231ef24d Label vehicle offsets 2016-02-18 21:47:24 +00:00
duncanspumpkin
772502309f Label ride offsets 2016-02-18 20:58:22 +00:00
duncanspumpkin
f267af3356 Fix chairlift bullwheel rotation animation.
Issue caused by incorrect check for breakdown
2016-02-18 20:32:04 +00:00
Martin Černáč
62672af35e Refactor sprintf and string_formater usages 2016-02-18 17:43:47 +01:00
Martin Černáč
361d30c6f5 Fix #2802 - extract hardcoded network-related strings
I extracted all of the hardcoded network-related strings. In addition to that, I also refactored the way last_disconnect_reason was being accessed/modified.
2016-02-18 14:52:02 +01:00
OpenRCT2 git bot
b13af3c8f5 Merge Localisation/master into OpenRCT2/develop. 2016-02-18 04:00:15 +00:00
IntelOrca
dc4602d255 add a GitHub issue template 2016-02-17 23:48:57 +00:00
duncanspumpkin
1e3a82a4ee Label known offsets.
Fixed a small issue with downtime history not being reset correctly on new ride creation
2016-02-17 20:03:40 +00:00
duncanspumpkin
9e391d7e03 Label known offsets 2016-02-17 18:22:38 +00:00
Ted John
9f9d54ead0 Merge pull request #2964 from octaroot/refactor_weather_cheat
Refactor freeze climate cheat
2016-02-17 17:50:37 +00:00
Martin Černáč
aff8cec48c Refactor freeze climate cheat 2016-02-17 17:39:33 +01:00
Duncan
93484c7956 Merge pull request #2932 from marijnvdwerf/peep-look-at
[WIP] Peep look at
2016-02-17 12:45:26 +00:00
Marijn van der Werf
9c456c6bf5 Add development suggestions 2016-02-17 13:31:03 +01:00
Marijn van der Werf
485b5114f5 Case ride excitement to uint16 before comparing 2016-02-17 13:30:36 +01:00
Marijn van der Werf
9850152d76 Make loop structures uniform 2016-02-17 13:30:36 +01:00
Marijn van der Werf
be7c8d58d9 Compress continue checks 2016-02-17 13:30:32 +01:00
Ted John
9c5196e9dc Merge pull request #2952 from octaroot/cheat_neverending_marketing
Add "neverending marketing" cheat
2016-02-17 12:28:37 +00:00
Marijn van der Werf
000e228b32 Remove location comments 2016-02-17 13:26:47 +01:00
Marijn van der Werf
a38485c6d5 Only validate ride/ride seat if return value is true 2016-02-17 13:26:47 +01:00