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

8110 Commits

Author SHA1 Message Date
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
Michał Janiszewski 59c3656352 Init drawing engine for screenshot subcommand. Fix #4029 (#4030) 2016-07-10 12:14:31 +02:00
Duncan 133ba62fa1 Merge pull request #4017 from gDanix/refactor-sub_6DAB4C_chunk_2 
Refactor sub_6DAB4C_chunk_2 [WIP]
 2016-07-10 08:25:53 +01:00
OpenRCT2 git bot b09e678fa9 Merge Localisation/master into OpenRCT2/develop. 2016-07-10 04:00:20 +00:00
Daniel Trujillo 8eeb6056a1 Fix grammar issues. 2016-07-10 00:01:55 +02:00
Daniel Trujillo 13f6959ae3 Rector block_brake_closed parameter from apply_block_brakes 
To remark that is a variable, rather than a constant (closed)
 2016-07-09 23:43:04 +02:00
Daniel Trujillo 3e782d9295 Deep splitting and rewriting of the sub_6D... code 2016-07-09 23:43:04 +02:00
Daniel Trujillo a3661e5842 Swapped if/else at line 5402 
Applied De Morgan's laws to simplify condition
 2016-07-09 23:43:04 +02:00
Daniel Trujillo 453b33a7b7 Move "apply_block_section_stop_site" on top of "check_and_apply...()" 
To make it callable from "check_and_apply...()"
 2016-07-09 23:43:04 +02:00
Daniel Trujillo 3e0754f14d Rename sub_6DAB4C_chunk_2 2016-07-09 23:43:04 +02:00
Daniel Trujillo 013266c6ae Add needed calls to the new function 2016-07-09 23:43:04 +02:00
Daniel Trujillo ed73a9dfe0 Break vehicle-handling code into another function 2016-07-09 23:43:04 +02:00
Daniel Trujillo efb720326d Add an implicit "else" 
After "vehicle->velocity = 0", the sentence:
"vehicle->velocity -= vehicle->velocity >> 3" doesn't have any
effect, so insert an "else" can clarify the code
 2016-07-09 23:43:04 +02:00
Daniel Trujillo 95e727d376 Add comments to the code 2016-07-09 23:43:04 +02:00
Daniel Trujillo 92b5e661fb Break an "else" into pieces 2016-07-09 23:43:04 +02:00
Daniel Trujillo f56f7065ac Make more obvious the last "else" previously made with a "return" 2016-07-09 23:43:04 +02:00
Daniel Trujillo cb4fe669a9 Name constant (1 << 5) -> MAP_ELEMENT_FLAG_BLOCK_BREAK_CLOSED 2016-07-09 23:43:04 +02:00
Ted John 7d21e10ee8 Merge pull request #4021 from janisozaur/wundef 
warn on undefined macros
 2016-07-09 12:17:08 +01:00
Michał Janiszewski f2eb63847f Fix missing define checks 2016-07-09 10:24:26 +02:00
Michał Janiszewski f82b4b4425 Add -Wundef to CMake-based builds 
Verifies all the defines are checked properly
 2016-07-09 10:06:09 +02:00
Michał Janiszewski 639f19adbf Fix define checks in project 2016-07-09 10:05:12 +02:00
Michał Janiszewski 9240280005 Only disable optimisations when using RCT2 segments (#4007) 2016-07-09 09:57:29 +02:00
duncanspumpkin 4fa10b049b Fix #3999. Animated objects correctly apply secondary colours 2016-07-09 08:05:25 +01:00
OpenRCT2 git bot 05540cfef0 Merge Localisation/master into OpenRCT2/develop. 2016-07-09 04:00:22 +00:00
Ted John 76b2621a51 Merge pull request #4000 from SijmenSchoon/develop 
Add a "default" button to the loadsave window
 2016-07-08 22:58:07 +01:00
Josue Acevedo bfce74f905 Minor fix: guest list not contain any guest. (#4016) 
Mistake that I made accidentally in #4006, caused because selected page takes the -1 value if the num of pages is 0 (it only happens if the num of guests is 0).
 2016-07-08 23:57:26 +02:00
Duncan 9af54d0fd7 Merge pull request #4015 from SijmenSchoon/ferris_prison 
Fix #4003: Fix the closing of ferris wheels
 2016-07-08 22:45:27 +01:00
Sijmen Schoon d06633331a Fix the closing of ferris wheels 
Well, that was anticlimactic
 2016-07-08 23:36:59 +02:00
Duncan 9e730c2ba7 Merge pull request #4012 from gDanix/fix-3749 
Fix #3749: Block Brake Issue when Run on Continous Non-block
 2016-07-08 21:13:28 +01:00
Josue Acevedo 68794c8ab8 Fix: page dropdown doesn't appear in guest list window. (#4006) 2016-07-08 20:17:56 +02:00
Daniel Trujillo d731a015ea Fix bug causing block brakes blocking vehicles in non-block mode 
A comparison has been added to ensure that, if the ride isn't in a
block-sectioned mode, the block brakes will act as a simple brakes
(with 6 km/h boosters)
 2016-07-08 19:03:22 +02:00
Sijmen Schoon 511ce8f06a Sort includes 2016-07-08 15:21:08 +02:00
Sijmen Schoon 66628e5131 Remove unused variable 2016-07-08 11:32:34 +02:00
Sijmen Schoon 662d92be74 Fix track load/save last-dir storing 
Doesn't really belong to this PR, but it's needed anyway
 2016-07-08 11:29:45 +02:00
Sijmen Schoon 2d7cd0e719 Change string ids to be consecutive 2016-07-08 11:29:02 +02:00
OpenRCT2 git bot 9efc0cab6a Merge Localisation/master into OpenRCT2/develop. 2016-07-08 04:00:20 +00:00
X123M3-256 6c0d4c52c3 Enable diagonal steep slopes for the junior coaster 2016-07-07 21:36:00 +01:00
Sijmen Schoon 47d69998e7 Straighten up window_loadsave_widgets 2016-07-07 11:50:06 +02:00
Sijmen Schoon 127d94d451 Add a default button to the loadsave window 2016-07-07 11:29:22 +02:00
OpenRCT2 git bot 52ed90ed95 Merge Localisation/master into OpenRCT2/develop. 2016-07-07 04:00:19 +00:00
Ted John 6a5ecf04de Merge pull request #3998 from gDanix/fix-3324 
Fix #3324: Opening tile inspector then footpath closes both windows.
 2016-07-06 20:59:54 +01:00
Ted John f866e6fac2 Merge pull request #3997 from SijmenSchoon/develop 
Remember previous save/load location
 2016-07-06 20:53:27 +01:00
Ted John ae80ba4888 Merge pull request #3993 from Rodbourn/develop 
Prevent rendering of hidden windows.
 2016-07-06 18:52:10 +01:00
Daniel Trujillo 6083bddc06 Vanity commit 2016-07-06 19:35:33 +02:00
Daniel Trujillo 966fbe812c Refactorize "update" callback to match coding standards. 2016-07-06 19:33:12 +02:00
Daniel Trujillo 2ea8ab1441 Fix #3324 
This commit fixes a bug involving tool windows being closed when the
tile inspector was opened. This was caused by calling tool_cancel()
from wrong places, causing all tool windows being closed.
 2016-07-06 19:26:14 +02:00
Sijmen Schoon e882bfe736 Change strdup to _strdup 2016-07-06 18:50:30 +02:00
Sijmen Schoon edbca4907a Update my entry in contributors.md 2016-07-06 18:24:42 +02:00
Sijmen Schoon fcf4008395 Remember previous save/load location 
Works for games, landscapes, scenarios and tracks (but this is commented out due to tracks not being separated or something?)
 2016-07-06 18:22:08 +02:00