Commit Graph

6405 Commits

Author SHA1 Message Date
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
Marijn van der Werf 14bf53bb30 Add drawing_fast.cpp to project 2016-02-20 13:41:45 +00:00
Michał Janiszewski aaf572ab27 Fix fastcall for non-MSVC toolchains 2016-02-20 13:41:44 +00:00
IntelOrca 3edc5c6f0a compile multiple versions of draw RLE sprite 2016-02-20 13:41:43 +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
Marijn van der Werf 9b8b90964e Use TRACK_SLOPE_NONE for comparing with bl 2016-02-19 17:19:34 +01:00
Martin Černáč 830b897dc6 Refactor conditional buffers and string_ids 2016-02-19 17:17:10 +01:00
Marijn van der Werf a157a7945c Fix structure of diagonal curves 2016-02-19 16:30:56 +01:00
Marijn van der Werf 7b2c3f5b88 Refactor known input/output combinations to use table 2016-02-19 13:31:00 +01:00
Marijn van der Werf a5ee1ddb56 More fixes 2016-02-19 01:29:30 +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
Marijn van der Werf 0b792cb927 Fix conditional 2016-02-19 00:16:03 +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
Marijn van der Werf 2b879cd586 [temp] log tracktype conditions 2016-02-18 22:01:54 +01:00
duncanspumpkin 772502309f Label ride offsets 2016-02-18 20:58:22 +00:00
Marijn van der Werf e20f487629 Fix mistakes 2016-02-18 21:44:09 +01: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
Marijn van der Werf 1f2afd6bac Process feedback 2016-02-18 14:24:09 +01:00
Marijn van der Werf b88ac9f26e Apply suggested fixes 2016-02-18 13:55:56 +01:00
Marijn van der Werf 76f0ca9afb Clean logic 2016-02-18 13:31:42 +01:00
Marijn van der Werf 235cc69b88 Decompile function 2016-02-18 13:02:59 +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