mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 12:03:07 +01:00
Code Issues Releases Wiki Activity
9,877 Commits 8 Branches 59 Tags
f349fbf1958f96ff140bad8a2ea89de4249bb623
Commit Graph

329 Commits

Author SHA1 Message Date
Michał Janiszewski
194c9aed01 Refactor scenario_write_packed_objects and friends 2016-10-21 11:22:17 +02:00
Michał Janiszewski
5ebc95e0b2 Mediate objects to send over from server 2016-10-21 11:22:17 +02:00
Michał Janiszewski
f3a2eb0247 Allow selecting only subset of loaded objects for export 2016-10-21 11:22:17 +02:00
Ted John
f519bc6cad Fix bugs 2016-10-15 21:50:52 +01:00
Ted John
babf261542 Refactor scenario list to C++ 2016-10-15 21:50:52 +01:00
Ted John
b7f7af3123 Refactor scenario sources to C++ 2016-10-15 21:50:52 +01:00
LRFLEW
e5ff7412e4 Refactor/Improve String and Path Handling 2016-10-09 15:29:58 -05:00
Michał Janiszewski
3c4a683701 Fix #4558: Crash on loading invalid scenario 2016-10-08 21:23:03 +01:00
Ted John
862b715003 Fix #4522: Theme music doesn't stop when connected to paused server 
Refactor audio initialisation and stop all music and sounds when the screen mode changes.
 2016-10-03 18:14:34 +01:00
Marijn van der Werf
487d6d8f15 Remove unnecessary addresses.h imports 2016-09-17 20:59:55 +01:00
Michał Janiszewski
305a949745 Remove unused RCT2_ADDRESS_EXPENDITURE_TABLE 2016-09-12 19:27:06 +02:00
Hielke Morsink
0ed526bb0d Fixes _scenarioFileName pointing to deleted memory 2016-09-11 22:30:13 +01:00
Ted John
0553ed5b95 Integrate various buffers 2016-09-10 23:01:42 +01:00
Ted John
4350e53392 Integrate gS6Info 2016-09-10 18:30:53 +01:00
Ted John
6a665330c2 Integrate gCommonStringFormatBuffer 2016-09-04 15:55:37 +01:00
Ted John
d86153e575 Integrate gMarketingCampaignDaysLeft, gMarketingCampaignRideIndex 2016-09-04 15:47:56 +01:00
Ted John
ae0eb1804c Integrate gParkRatingCasualtyPenalty 2016-09-04 15:44:59 +01:00
Ted John
9478e0a53e Integrate gHistoricalProfit 2016-09-04 15:36:39 +01:00
Ted John
e47b8d906e Integrate gLastEntranceStyle 2016-09-04 15:21:49 +01:00
Ted John
5893c6da82 Remove loan hash, but keep for S6 export 2016-09-04 15:11:15 +01:00
Ted John
3c80df07d4 Integrate gSavedAge 2016-09-04 15:11:15 +01:00
Ted John
8993328232 Integrate some scenario strings 2016-09-04 15:11:15 +01:00
Ted John
8cf7e87b5c Fix many warnings for x64 2016-08-27 23:32:15 +01:00
Michał Janiszewski
0ece63a7f6 Wrap RCT2's addresses in RCT2_ADDRESS macro 2016-08-06 21:38:46 +01:00
Ted John
c2db79919d Integrate gWindowUpdateTicks 2016-08-06 01:35:46 +01:00
Michał Janiszewski
801c7f27d5 Use named addresses 2016-08-05 22:46:45 +01:00
Yaroslav Tretyakov
53a7b87414 Fix #4204: Client trying to get sprite 65535 
Caused by a conflict between a multiplayer map download and the title loading a different map.
 2016-08-05 22:46:19 +01:00
Michał Janiszewski
b16b6814aa Fix pointer types for 64 bit builds 2016-08-01 23:14:42 +02:00
Michał Janiszewski
a6d0e6916e Fix function definitions to match their declarations 
This makes sure every function is properly declared, which includes
proper `extern` wrappers.
 2016-07-14 14:11:49 +02:00
Ted John
04340021f6 Fix #4071: Guests paid when free entry park flag 
Make most usages of park entrance fee use a common function which does the necessary checks.
 2016-07-13 19:48:42 +01:00
Ted John
dca816cfd3 Merge pull request #4024 from IntelOrca/refactor/object-list 
Refactor and improve the object system:
- Objects are now exported to user directory under 'object'.
- Object directories are scanned recursively.
- Improves reliability of object loading and handling of bad objects.
- Improve performance of object scanning.
- Only load new objects when loading a new game.
- Improve changing language experience.
 2016-07-11 23:45:45 +01:00
Michał Janiszewski
639f19adbf Fix define checks in project 2016-07-09 10:05:12 +02:00
Ted John
6f97ec798e remove object entry addresses and use constants 2016-07-08 22:58:38 +01:00
Ted John
a47c039f22 remove lots of old object code 2016-07-08 22:58:38 +01:00
Michał Janiszewski
402e5a32a0 Integrate path variables used by game 2016-06-19 23:52:20 +02:00
Michał Janiszewski
ba7008df18 Integrate some scenario variables 
gScenarioTicks is still being used in some of native code
 2016-06-19 23:52:20 +02:00
Ted John
d07b9535c2 integrate variables: object entry lists 2016-06-16 11:36:15 +02:00
CraigCraig
c946d2fb06 Various Spelling Fixes - 5/29/16 (#3770) 2016-05-29 10:00:38 +01:00
Ted John
25ac99e04a add variable for gS6Info 2016-05-20 23:26:19 +01:00
janisozaur
ca430e1b23 Drop unused variables (#3586) 2016-05-13 18:21:58 +01:00
Ted John
1229cbd540 clean up s6 struct a bit 2016-05-11 22:30:25 +01:00
Ted John
30a044ae72 add globals for gWeeklyProfitAverage... 2016-05-11 19:41:34 +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
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
9d7db70965 export variables individually 2016-05-08 22:35:12 +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