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

8267 Commits

Author SHA1 Message Date
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
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
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
Josue Acevedo d52fabb9d7 Fix guest sorting with guests that have a generated name. (#4028) 2016-07-12 20:17:59 +02:00
duncanspumpkin af2746e087 Display path name of incorrect track checksum. Part of #4063 2016-07-12 17:44:19 +01:00
OpenRCT2 git bot a4223d995f Merge Localisation/master into OpenRCT2/develop. 2016-07-12 04:00:23 +00:00
Marijn van der Werf 6c702fb1a9 Set correct sprite type for Magic Carpet drawing 2016-07-11 23:46:43 +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 ef09dcd64a Add another assert to decode_chunk_rle_with_size 2016-07-11 22:52:43 +01:00
Ted John edb4a4a822 fix get capacity string for vehicles 2016-07-11 22:50:55 +01:00
Ted John eb275604fa update changelog 2016-07-11 22:16:14 +01:00
Ted John 4bf9748143 fix drawing of object preview 
We can't use dpi->width and dpi->height as they only define the clip region, not the viewport
 2016-07-11 22:09:15 +01:00
Ted John 21e5093153 Merge pull request #4018 from SijmenSchoon/track-save-dialog 
Use OpenRCT2 dialog for saving tracks
 2016-07-11 19:11:33 +01:00
Ted John 81a597ab0d append salt bytes inside encoded data chunk 2016-07-11 19:09:16 +01:00
Ted John cf59929eaa add extra salt bytes to exported objects if checksum is wrong 2016-07-11 18:42:43 +01:00
Sijmen Schoon 38f402f156 Remove variable that became unused because of 06de7b 2016-07-11 19:26:25 +02:00
Sijmen Schoon de83ada6f5 Fix string order 2016-07-11 19:15:30 +02:00
Sijmen Schoon ccdb59d48b Fix sting ids 2016-07-11 19:13:53 +02:00
Sijmen Schoon 06de7bc1e1 Set default track folder to user track directory 
Fixes #4019
 2016-07-11 19:13:30 +02:00
Sijmen Schoon 773c7e04ef Remove stray space 2016-07-11 19:13:30 +02:00
Sijmen Schoon d8bc890d0a Exit scenery selection mode when done saving 2016-07-11 19:13:30 +02:00
Sijmen Schoon 79a85cd659 Save track designs as td6 file 2016-07-11 19:13:30 +02:00
Sijmen Schoon 9d1ae9b576 Fix track save system dialog crash 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
Ted John f5391a366f Merge pull request #4048 from Goddesen/fix_4037_utf8_cursor 
Use UTF-8 to measure cursor size in text input.
 2016-07-11 18:00:17 +01:00
Ted John 7ae7c4f498 Merge pull request #4020 from duncanspumpkin/rate_input 
Allow rate input by text box
 2016-07-11 17:58:38 +01:00
Ted John 8851e43367 CI: Always add build symbols to artefacts 2016-07-11 13:00:25 +01:00
Josue Acevedo cc2d91a642 Fix #4042: Park name isn't shown in objective selection 2016-07-11 09:54:37 +01:00
Josue Acevedo c17a89707c Fix #4031: Costs of land rights not displayed when hovering a tile 2016-07-11 09:31:42 +01:00
OpenRCT2 git bot a5a0e0fc0e Merge Localisation/master into OpenRCT2/develop. 2016-07-11 04:00:20 +00:00
Goddesen 555eb227a8 Remove uint32 cast - size_t can be safely compared to size_t. 2016-07-11 02:15:15 +02:00
Goddesen 23e4fe63d0 Use utf8 to measure cursor size in text input. 2016-07-11 02:15:15 +02:00
Daniel Trujillo Viedma 1e3504cd36 Fix #1432: Sandbox mode reducing map size causes game to freeze 
Shift correctly direction bits when calling game_do_command.

game_command_remove_large_scenery() expects the direction bits
to be shifted 8 times to the left, so the call to game_do_command
has been modified to match this requirement.
 2016-07-10 23:11:04 +01:00
Ted John 0a5ce82632 log warnings and information as verbose 2016-07-10 16:34:54 +01:00
Michał Janiszewski 59c3656352 Init drawing engine for screenshot subcommand. Fix #4029 (#4030) 2016-07-10 12:14:31 +02:00
duncanspumpkin 50c2e52b57 Use better text descriptions. Holding down rate buttons now increase/decrease 2016-07-10 09:26:23 +01:00