1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Commit Graph

6451 Commits

Author SHA1 Message Date
Marijn van der Werf
68c5106987 Apply suggestions 2016-02-17 13:26:47 +01:00
Marijn van der Werf
e758441f65 Remove useless anding 2016-02-17 13:26:47 +01:00
Marijn van der Werf
f62cedeaf4 Make compileable and add comparison 2016-02-17 13:26:46 +01:00
Marijn van der Werf
e271a9f66b Decompile until end 2016-02-17 13:26:46 +01:00
Marijn van der Werf
f04476c3a6 Decompile until 00690E60 2016-02-17 13:26:46 +01:00
Marijn van der Werf
29dc4b1eed Decompile until 0x00690D04 2016-02-17 13:26:46 +01:00
Marijn van der Werf
17777467c0 First section 2016-02-17 13:26:46 +01:00
Martin Černáč
6c225b9fb1 Make "neverending marketing" cheat multiplayer-friendly 2016-02-17 09:36:04 +01:00
Martin Černáč
fdfb4f7bd3 Add "neverending marketing" cheat
This cheat allows the player to have never-ending marketing campaigns
2016-02-17 09:35:56 +01:00
Ted John
2770068de3 Update readme.md 2016-02-16 23:39:59 +00:00
Ted John
de06082176 Merge pull request #2960 from PFCKrutonium/patch-1
Add a link to the non-dev chat in the Readme
2016-02-16 23:38:09 +00:00
Krutonium
2b94ec2939 Add a link to the non-dev chat in the Readme 2016-02-16 17:27:44 -05:00
IntelOrca
13921111f3 remove old RCT2 cursor code and RCT2 error location variable 2016-02-16 20:30:43 +00:00
IntelOrca
38fda5debf remove old redundant RCT2 platform code 2016-02-16 20:23:32 +00:00
IntelOrca
5cf0c4bd07 remove commented out callproc/funcs 2016-02-16 20:10:24 +00:00
duncanspumpkin
115f600735 Fix #2942. Stacked shops now show correct supports.
Issue was caused by overwriting the variable that is used as a flag to disable supports.
2016-02-16 19:22:15 +00:00
Duncan
4b5119d190 Merge pull request #2953 from duncanspumpkin/sub_6CB945
Sub 6cb945
2016-02-16 18:46:38 +00:00
duncanspumpkin
b044d0c5e2 Implemented sub_6CB945 2016-02-16 18:45:15 +00:00
duncanspumpkin
e7b690acac Fix #2959. Water splash correctly drawn in track preview.
Issue was caused by missing code that was used to work out the min z value required to place the ride. Without this the watersplash was placed at an invalid z value.
2016-02-16 18:18:43 +00:00
IntelOrca
c31941c6dc fix #2958: import sc4, sv4 into editor using load landscape dialog 2016-02-16 18:15:26 +00:00
IntelOrca
b11afac5c8 potential fix or improvement to #2924: ride sync
- Do not delete rides when sending map to clients.
- Only do track related checks for track, not flat rides
2016-02-15 22:01:29 +00:00
Ted John
d42f8c5499 Merge pull request #2946 from Gymnasiast/debugging-tools-dropdown
Leave the debugging tools dropdown open after click, closes #2768
2016-02-15 13:45:53 +00:00
Ted John
faa6badea0 Merge pull request #2948 from Gymnasiast/designs-available
Don't say there are track designs available in multiplayer
2016-02-15 13:45:11 +00:00
Ted John
10dff09160 Merge pull request #2947 from janisozaur/headless
Don't do uncapped FPS when running headlessly
2016-02-15 13:36:46 +00:00
Gymnasiast
6cdab73cdf Don't say there are track designs available in multiplayer 2016-02-15 11:20:07 +01:00
Michał Janiszewski
4aac5c035f Don't do uncapped FPS when running headlessly 2016-02-15 10:41:09 +01:00
Gymnasiast
32ff10ec4d Leave the debugging tools dropdown open after click, closes #2768 2016-02-15 10:00:14 +01:00
Ted John
c441d2f6f4 Merge pull request #2945 from Overv/fix-screenshot-palette
Change screenshot logic to use palette that is actually used for rendering (fixes #2925)
2016-02-15 07:59:30 +00:00
Ted John
27de4fd060 Merge pull request #2944 from Overv/fix-title-screen-text-input
Fix enter not working for text inputs in the title screen (fixes #2941)
2016-02-15 07:55:52 +00:00
Alexander Overvoorde
316abb1df9 Change screenshot logic to use palette that is actually used for rendering (fixes #2925) 2016-02-15 03:23:47 +01:00
Alexander Overvoorde
ad05d0b5f0 Fix enter not working for text inputs in the title screen (fixes #2941) 2016-02-15 02:45:57 +01:00
Ted John
9fd24651f9 Merge pull request #2939 from janisozaur/perf
Use GCC's __builtin_ffs for bitscanforward impl
2016-02-14 23:24:40 +00:00
Michał Janiszewski
016d26976e Add a note about low-hanging optimisation fruit 2016-02-15 00:17:15 +01:00
Michał Janiszewski
f447b9665a Use GCC's __builtin_ffs for bitscanforward impl 2016-02-15 00:05:33 +01:00
Duncan
f15d8bc5e4 Merge pull request #2937 from janisozaur/fixes
Fixes
2016-02-14 22:05:05 +00:00
Michał Janiszewski
a09afd0be5 Minor fixes
* Be more cautious while doing pathfinding
* Be a little more deterministic on network by initialising all member
  fields.
2016-02-14 22:22:38 +01:00
Michał Janiszewski
2ebb691e71 minor fixes
* initialize variables properly
* fixes to handling of zenity/kdialog on Linux
* remove unnecessary call
2016-02-14 21:06:44 +01:00
duncanspumpkin
cd2d14fcec Reload vehicleEntry on change in car to fix special trains.
You can have different flags set for different train cars
2016-02-14 19:52:35 +00:00
Ted John
b11fbe9ab1 Merge pull request #2936 from janisozaur/ride-subtype
Don't crash when dealing with a hacked ride subtype
2016-02-14 18:06:18 +00:00
Michał Janiszewski
2cce13da1b Don't crash when dealing with a hacked ride subtype 2016-02-14 18:47:57 +01:00
IntelOrca
8268f607cd implement track_remove_station_element 2016-02-14 17:37:28 +00:00
IntelOrca
c137ac41c0 implement track_add_station_element 2016-02-14 15:29:53 +00:00
duncanspumpkin
843b588b15 Remove redundant callproc code / comments. 2016-02-14 09:34:30 +00:00
Duncan
0cbc8d9372 Merge pull request #2903 from OpenRCT2/peep
Staff Path Finding
2016-02-14 09:29:55 +00:00
Duncan
58d0cc9e79 Merge pull request #2929 from Wirlie/patch-1
One issue fixed with Ferris Wheel
2016-02-14 07:20:15 +00:00
Duncan
0e75efc1eb Merge pull request #2927 from OpenRCT2/clear_funcs
Implement Clear funcs
2016-02-14 07:19:33 +00:00
OpenRCT2 git bot
ab04ece601 Merge Localisation/master into OpenRCT2/develop. 2016-02-14 04:00:17 +00:00
Wirlie
4e3261decb One issue fixed with Ferris Wheel 2016-02-13 20:29:41 -06:00
Ted John
fc8197b194 Merge pull request #2928 from LRFLEW/backslash
Use Double-Backslash Escaping in Config.ini
2016-02-14 00:50:27 +00:00
LRFLEW
aab0ad1779 Use Double-Backslash Escaping 2016-02-13 17:29:58 -07:00