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

8352 Commits

Author SHA1 Message Date
duncanspumpkin 5426b655fe Try combine _freelists when freeing to reduce chance of running out of images. 2016-07-16 14:12:15 +01:00
Michał Janiszewski 601f344b40 Integrate g_music_tracking_viewport 2016-07-16 13:07:01 +01:00
Ted John fd339d29b1 import pointer parts of data for top spin and rotations 2016-07-16 13:06:05 +01:00
Ted John 439220b86e import SwingingTimeToSpriteMaps data 2016-07-16 13:06:05 +01:00
Ted John 1d8f14715c import vehicle data for various rides 2016-07-16 13:06:05 +01:00
Duncan 1e1546d87c Merge pull request #4064 from gDanix/fix-4060 
Fix #4060: Block brakes have a different behaviour from RCT2.
 2016-07-16 13:04:53 +01:00
Ted John edd661659b Merge pull request #4100 from IntelOrca/import-peep-data 
Import static peep data.
 2016-07-16 00:13:04 +01:00
LRFLEW 287289b52f Update Xcode project 2016-07-16 00:03:46 +01:00
Ted John 3a8b0c662f import peep sprite data 2016-07-15 23:56:51 +01:00
Ted John 79cc7ff250 use PeepThoughtToActionMap for 0x00981DB1 2016-07-15 22:58:32 +01:00
Ted John 8f4ba85b89 import unk_982134 2016-07-15 22:55:19 +01:00
Ted John c8e3c338f2 import unk_981D8C and unk_981D8F 2016-07-15 22:46:27 +01:00
Ted John 4cee21a515 import PeepThoughtToActionMap data 2016-07-15 22:42:29 +01:00
Ted John fbcaf735b9 Merge pull request #3805 from wolfreak99/window_limit 
Add option to set window limit.
 2016-07-15 20:54:50 +01:00
Daniel Trujillo Viedma 4f074cc07f Fix #4013: Scroll bar can get tiny for extremely long lists (#4025) 2016-07-15 21:49:00 +02:00
Michał Janiszewski b66853383e Add more checks to object loading 2016-07-15 18:50:15 +01:00
Michał Janiszewski 1742ce71ed Fix handling of signed types 2016-07-15 18:48:22 +01:00
Ted John 5eea851bc8 Merge pull request #4078 from SijmenSchoon/refactor/loadsave 
Refactor window/loadsave.c
 2016-07-15 18:44:35 +01:00
Sijmen Schoon 2d24678c05 Fix #4081: Scrolling over non-scroll areas causes other areas to scroll 2016-07-15 16:50:18 +01:00
wolfreak99 d879192542 travisci fix 2016-07-15 10:38:38 -04:00
wolfreak99 3b8bd8ce93 rename max_window_count to window_limit_max 2016-07-15 10:25:59 -04:00
wolfreak99 44202d0bd1 Allow setting limit on maximum windows allowed 
This provides an option to set a limit on the number of windows that can
be open. Originally, the game had somewhere around 12, but was bumped up
to 64 for OpenRCT2. While this provides some value, this is for people who
prefer less windows at a time, and also for people with older computers.
The limit can be set anywhere between 8 and 64, (8 being chosen to still
preserve in-game toolbars that are counted as windows, and 64 to not
overshoot the maximum hard-coded value). This can be set in both options
and the in-game-console.
 2016-07-15 07:07:34 -04:00
OpenRCT2 git bot 6428e3e42d Merge Localisation/master into OpenRCT2/develop. 2016-07-15 04:00:20 +00:00
Sijmen Schoon 6e765d2917 Remove trailing whitespace 2016-07-14 22:50:52 +02:00
Josue Acevedo 097c5b101d Fix open ride error messages 
Some error messages aren't properly displayed because 'gGameCommandErrorText' is replaced with 'STR_NONE' before it's displayed.

This only happens with commands that use multiple commands inside them for do another "job" (or do another check).
 2016-07-14 20:00:16 +01:00
Sijmen Schoon 1b5d6aba79 Change .image to .text 2016-07-14 20:45:34 +02:00
Sijmen Schoon bae92997c3 Sort includes 2016-07-14 20:45:34 +02:00
Sijmen Schoon 70b2779654 Add a failsave to the parent directory code 2016-07-14 20:45:34 +02:00
Sijmen Schoon 95a081bf38 Fix drive listing on Windows 2016-07-14 20:45:34 +02:00
Sijmen Schoon 53e469834b Clean up window_loadsave_populate_list 2016-07-14 20:45:34 +02:00
Sijmen Schoon bf51ae7e26 Refactor rest of window_loadsave_mouseup 2016-07-14 20:45:34 +02:00
Sijmen Schoon 58964cb301 Refactor WIDX_UP and WIDX_NEW 2016-07-14 20:45:34 +02:00
Sijmen Schoon 446db73dc2 Fix refactoring oversight in window_loadsave_open 2016-07-14 20:45:34 +02:00
Sijmen Schoon a26ad34ecd Remove unused function has_extension 2016-07-14 20:45:34 +02:00
Sijmen Schoon 0100ae7cd3 Refactor window_loadsave_open 2016-07-14 20:45:34 +02:00
Ted John 6fc36cbabb Merge pull request #4072 from janisozaur/missing-declarations 
Add missing declarations, it can potentially help produce better ELF binaries, as they historically struggle with exported symbols.
 2016-07-14 18:11:48 +01:00
Michał Janiszewski 836450cab4 Fix declarations of network-less builds 2016-07-14 14:11:50 +02:00
Michał Janiszewski 31a219a961 Fix declaration of Windows' `StartOpenRCT` 2016-07-14 14:11:50 +02:00
Michał Janiszewski 550ac03ab7 Enforce proper declarations for every function 
Enables -Wmissing-declarations for CMake projects
 2016-07-14 14:11:50 +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
Marijn van der Werf 5204fb0ce9 Clean up string and sprite ID's (#3977) 2016-07-14 14:07:49 +02:00
Sijmen Schoon fb456a86ea Fix #4061: Wrong error message when opening all rides with unfinished rides 
Show the proper error when opening all rides goes wrong.
 2016-07-14 11:26:12 +01:00
OpenRCT2 git bot 7c16ad3d82 Merge Localisation/master into OpenRCT2/develop. 2016-07-14 04:00:23 +00:00
Ted John b6b8ce18f0 Fix #4062: Crash when unable to allocate image table 
Check if realloc succeeded.
 2016-07-13 19:57:14 +01: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 c09780967b Fix #4069: Assertion when applying no-money 
There was one case where it called peep_spend_money without checking if money was enabled
 2016-07-13 19:08:35 +01:00
Sid Roberts 961f0f9f9a Fixed typos in README (#4067) 2016-07-13 11:00:01 +02:00
OpenRCT2 git bot b63dae51c4 Merge Localisation/master into OpenRCT2/develop. 2016-07-13 04:00:21 +00:00
Daniel Trujillo 8638cf924d Refactor hill stop site code 2016-07-12 20:33:19 +02:00
Josue Acevedo d52fabb9d7 Fix guest sorting with guests that have a generated name. (#4028) 2016-07-12 20:17:59 +02:00