mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,515 Commits 8 Branches 40 Tags 362 MiB
Commit Graph

271 Commits

Author SHA1 Message Date
Marijn van der Werf 082e4c76fa Include data from `0x0097D7CB` 2016-08-05 11:53:44 +01:00
Ted John 32fea99c36 Merge pull request #4210 from janisozaur/integrate 
Fix pointer types for 64 bit
 2016-08-04 23:14:29 +01:00
Michał Janiszewski 501f0126fa Fix #4213: FPS decreases with track window 
The code must've been from before I got everything working properly,
because removing both these lines does not cause any glitches in
rendering.
 2016-08-04 21:22:12 +01:00
Michał Janiszewski 436809f778 Integrate rct_window::var_496 2016-08-04 21:54:37 +02:00
Michał Janiszewski 91e04282ee Fix pointer types for 64 bit 2016-08-03 23:33:12 +02:00
Ted John 70853d65d6 Merge pull request #4203 from janisozaur/integration 
Integration commits from #4181
 2016-08-03 21:21:27 +01:00
Michael Steenbeek c522f9cfd3 Implement max people on maze properly 
Last year the limit for max people on maze was raised using a hack. Since the responsible table has been implemented since then, remove the hack and update the value in the table.
 2016-08-03 19:41:31 +01:00
Marijn van der Werf 7bfdbbd409 Include ride stats labels 2016-08-02 23:32:58 +02:00
Marijn van der Werf 51f4988e06 Clean/include peep/staff vars 2016-08-02 23:32:58 +02:00
Michał Janiszewski a7f31dda4f Fix issues from gRideProperties review 
Also renames it to RideProperties
 2016-08-02 23:04:18 +02:00
Michał Janiszewski 09a20524a5 Integrate gRideProperties 2016-08-01 23:14:42 +02:00
Michał Janiszewski 41049e5a32 Fix positions of widgets 2016-08-01 22:17:38 +02:00
Michał Janiszewski 062ab25f95 Fix invalidation issues 2016-08-01 20:30:08 +02:00
Michał Janiszewski 155bc054df Fix #4172: Expose ride-type changing capability in UI 
This also allows changing ride type in multiplayer games. Very crashy.
 2016-08-01 20:30:08 +02:00
Marijn van der Werf a17e6cee5e Use constants for shop item images 2016-07-28 23:28:32 +02:00
Marijn van der Werf 9401afa68f Use constants for colour preview images 2016-07-28 23:28:32 +02:00
Ted John 487fcc3c5b Fix #4134: Can't enable park-wide photo price for log flume and river ra 
Caused by not shifting the shop item flags (those above 32) to the correct mask bit.
 2016-07-19 18:35:44 +01:00
Michał Janiszewski 9f57c82653 Refactor access to g_sprite_list 
Hide g_sprite_list behind accessor function with a check. `assert` is
temporarily disabled, as it breaks nearly every park.
 2016-07-17 22:19:34 +02:00
Ted John 304d6d9304 Fix #4110: guests still get charged for rides 2016-07-16 16:27:49 +01: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
Marijn van der Werf 5204fb0ce9 Clean up string and sprite ID's (#3977) 2016-07-14 14:07:49 +02: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
Ted John edb4a4a822 fix get capacity string for vehicles 2016-07-11 22:50:55 +01:00
Sijmen Schoon d8bc890d0a Exit scenery selection mode when done saving 2016-07-11 19:13:30 +02:00
Sijmen Schoon a194c91997 Use OpenRCT2 dialog for saving tracks 2016-07-11 19:13:30 +02:00
jensj12 f4690fb879 Remove duplicate check (#3743) 2016-05-26 15:56:57 +01:00
Martin Černáč 4d5b9c97fd Fix #3685. Also refactor related enum value. (#3686) 2016-05-20 22:29:33 +01:00
Martin Černáč 4944fe1836 Fix a Copy-paste induced mistake (#3679) 2016-05-20 09:49:08 +01:00
Martin Černáč c8b8f0f226 Refactor and add better operation-mode bound checks (#3600) 2016-05-19 18:21:36 +01:00
Duncan 163c695a13 Merge pull request #3538 from marijnvdwerf/paint-setup/submarine-ride 
Paint Submarine Ride
 2016-05-18 22:06:03 +01:00
Marijn van der Werf 1bf9dc26f9 Rename entrance flags to base_image_id 2016-05-18 23:00:26 +02:00
Martin Černáč 3bdc06dc25 Refactor hard-coded strings to use string_ids.h constants (and couple sprites too) (#3658) 2016-05-18 21:51:37 +01:00
Martin Černáč 2b6770bfad Fix redundat separator in ride's measurement & test data window tab (#3654) 2016-05-18 21:04:57 +01:00
Martin Černáč feed51de27 Add correct tooltip entry for the no. circuits (#3650) 2016-05-18 12:56:30 +01:00
Ted John cbf9a393f1 remove use of get_format_arg 
Because of strict aliasing, we must use memcpy in some cases.
 2016-05-15 22:40:25 +01:00
Ted John 1cc35dfe6e integrate common format args 2016-05-15 22:03:53 +01:00
janisozaur ca430e1b23 Drop unused variables (#3586) 2016-05-13 18:21:58 +01:00
janisozaur 658e877955 Name all the typdef-ed structs (#3581) 2016-05-12 22:57:40 +01:00
Ted John aa929e1593 add globals for researched things, cleanup 2016-05-10 00:00:59 +01:00
Ted John 3c3a37073d add global macro for gSamePriceThroughoutPark 2016-05-09 21:18:44 +01:00
Ted John f9074485f9 integrate more variables 2016-05-08 14:04:04 +01:00
Ted John cbc1848db4 refactor track design save: _trackSavedMapElements 2016-05-08 14:04:00 +01:00
Ted John c0fa762fa5 integrate some unknown variables 2016-05-08 14:04:00 +01:00
Ted John 1908743c71 refactor track save, move into own source 2016-05-08 14:03:49 +01:00
Ted John 77e7313540 move track design related functions to new source 2016-05-08 14:03:48 +01:00
Gymnasiast 17626dbb1a Increase station limit to 32, fix display of plural 2016-05-06 18:30:44 +02:00
janisozaur 68bad6505c Add and correct licence headers to all sources (#3108) 2016-05-04 18:24:41 +01:00
Patrick de Wit 60579932ef Fix overflow in ride_mode_tweak (#3478) 
Fixes #2529: Time overflow when unlocking dodgems' operating limits
Fixes #3424: Max. people on ride overflows when operating limit is unlocked
 2016-05-03 14:44:54 +01:00
Gymnasiast 5d0b79227f Clean up some magic values and refactor a bit 2016-05-03 07:25:19 +02:00
Michał Janiszewski 1cd1144dd5 Janitorial fixes 
Mostly style fixes, includes minor change to make sure spinner's down
button gets shown, update to string IDs, network version and making sure
correct string gets selected based on car count.
 2016-05-02 22:35:08 +02:00