mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 18:31:59 -05:00
Code Issues Projects Releases Packages Wiki Activity
7258 commits 10 branches 46 tags 399 MiB
Commit graph

7258 commits

This branch
This branch
All branches
Author SHA1 Message Date
duncanspumpkin
e47684bf53 Fix image offset by 1 error. 2016-05-10 20:43:18 +01:00
Duncan
04b3103fa9 Merge pull request #3548 from zsilencer/paint-setup/river-rapids 
Remaining vehicle paint setups
 2016-05-10 19:34:45 +01:00
zsilencer
6761751f3f Suggested review changes 2016-05-10 11:53:33 -06:00
Ted John
f38cde8f9b fix #3556: add rest of constant data for RideTypePossibleTrackConfigurations 2016-05-10 18:34:05 +01:00
Michael Steenbeek
8efdf4e960 Typo 2016-05-10 10:41:32 +02:00
OpenRCT2 git bot
5636e6a130 Merge Localisation/master into OpenRCT2/develop. 2016-05-10 04:00:18 +00:00
Ted John
aa929e1593 add globals for researched things, cleanup 2016-05-10 00:00:59 +01:00
Ted John
b5c0913b76 add global macros for a few more things, ride rating related and misc 2016-05-09 22:54:22 +01:00
Ted John
5162bc5a0e add global macro for a few ride variables and expenditure table 2016-05-09 22:11:56 +01:00
Ted John
3c3a37073d add global macro for gSamePriceThroughoutPark 2016-05-09 21:18:44 +01:00
Ted John
275f7c6723 add global macro for gCurrentExpenditure, gCurrentProfit 2016-05-09 21:12:01 +01:00
Ted John
3105d62d3b add global macro for gTotalAdmissions, gTotalIncomeFromAdmissions 2016-05-09 21:05:17 +01:00
Ted John
be2d1127f5 add global macro for gResearchLastItemSubject 2016-05-09 20:38:26 +01:00
janisozaur
e28d6634fd Allow builds without -fno-omit-frame-pointer (#3554) 
Disables optimizations done to addresses.c, so frame pointer doesn't
have to be kept, allowing for more aggressive optimizations to be done.
 2016-05-09 20:24:37 +01:00
janisozaur
d7a51aadee Sanity checks for RCT1 SC4 import (#3551) 2016-05-09 19:13:21 +01:00
zsilencer
05213e4cfb Decompile remaining vehicle splash effects 2016-05-09 09:41:12 -06:00
janisozaur
8d0481deba Make sure to only update valid vehicles (#3543) 
Lets us load parks like Six Flags Carolina:
http://www.nedesigns.com/park/1571/six-flags-carolina/
 2016-05-09 15:52:03 +01:00
zsilencer
a5032aebd1 Decompile vehicle_visual_default 2016-05-09 08:48:48 -06:00
zsilencer
871ed67a78 Decompile vehicle_visual_reverser 2016-05-09 08:48:48 -06:00
zsilencer
d199329d0f Decompile vehicle_visual_splash_boats_or_water_coaster 2016-05-09 08:48:48 -06:00
zsilencer
414829a2ea Decompile vehicle_visual_river_rapids and vehicle_visual_splash_effect 2016-05-09 08:48:47 -06:00
Harry Lam
f75e0c1d77 Update contributors.md (#3542) 
[ci skip]
 2016-05-09 14:17:56 +02:00
Michael Steenbeek
f983fb6c69 Update contributors.md 2016-05-09 11:42:35 +02:00
Matthias Mailänder
79e410d88c Add a .desktop file. (#3507) 2016-05-09 08:57:59 +02:00
OpenRCT2 git bot
05384db02a Merge Localisation/master into OpenRCT2/develop. 2016-05-09 04:00:20 +00:00
Ted John
d2c5501eea refactor sprite heads and counts 2016-05-09 00:08:03 +01:00
Ted John
5ccfd83dea add global macro for gScenarioTicks 2016-05-08 23:20:42 +01:00
Ted John
c77311a113 small fix and refactor of S6Importer / Exporter 2016-05-08 23:16:25 +01:00
Ted John
0570ec27ff Merge pull request #3528 from IntelOrca/refactor/s6importer 
Add S6Importer and S6Exporter
 2016-05-08 23:08:08 +01:00
Marijn van der Werf
47840cb4b8 update xcode project 2016-05-08 22:35:12 +01:00
Ted John
9d7db70965 export variables individually 2016-05-08 22:35:12 +01:00
Ted John
2ab41b547a use S6Importer for network load game 2016-05-08 22:35:11 +01:00
Ted John
bc7d1343da fix crash, just always reset loaded objects 2016-05-08 22:35:10 +01:00
Ted John
09fab986ed remove old code 2016-05-08 22:35:10 +01:00
Ted John
a86bc57a96 use S6Exporter for scenario_save 2016-05-08 22:35:09 +01:00
Ted John
4eb7a7ee0e add S6 exporter 2016-05-08 22:35:08 +01:00
Ted John
9a61d8c885 add importing of scenarios 2016-05-08 22:35:07 +01:00
Ted John
3bb1d47813 use new S6Importer for loading saved games 2016-05-08 22:35:06 +01:00
Ted John
30467a1467 copy over game variables and refactor a few 2016-05-08 22:35:05 +01:00
Ted John
3557c7c8eb add S6 importer and chunk loading 2016-05-08 22:35:05 +01:00
Matte A
c7c3923556 Fix conflicting strings (#3534) 2016-05-08 21:55:04 +01:00
Matthias Mailänder
76cca7ad2e Expand the search dirs for the linker script. (#3530) 2016-05-08 21:11:24 +01:00
Steven Vascellaro
dbb64f8ea3 Added additional tooltips for options menu (#3394) 
Added tooltips for every selectable item in the options menu, as well as some minor variable renaming and vertical alignment
 2016-05-08 17:22:48 +01:00
Ted John
fc6a589c35 Merge pull request #3477 from IntelOrca/feature/multiple-trackdesign-locations 
Scan track designs from multiple locations and refactor
 2016-05-08 14:15:38 +01:00
Ted John
094d395567 create tracks directory on save track 2016-05-08 14:04:16 +01:00
Ted John
4d7e693ace fix non-deterministic file dialog title for save track 2016-05-08 14:04:15 +01:00
janisozaur
f60855ab95 Fix strict aliasing breakage in ride_set_name() (#9) 2016-05-08 14:04:15 +01:00
Michał Janiszewski
0366a6c57f Fix possible bad memory access when placing track design 
Name of ride can be set to a string of variable length, like in
`track_design_open` it gets set to the variable length filename. In
`ride_set_name`, however, the ride name is accessed as if it was
36-bytes long anyway. This makes sure all 36 bytes are available for
accessing.
 2016-05-08 14:04:14 +01:00
Michał Janiszewski
227c772099 Fixes to track design manager 
Fix errorneous sizeof() argument, skip unneeded memset
 2016-05-08 14:04:13 +01:00
YJSoft
db7f5cff81 add files at xcode project for #3477 2016-05-08 14:04:12 +01:00