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

11371 Commits

Author SHA1 Message Date
Marijn van der Werf 3cf725745d Add compile-time checked constants for widget ids 2017-05-02 09:58:25 +02:00
zaxcav 0debd879da Ignore wide flags on patrol zone edges in path finding heuristic, fixes #5414 
Wide path flags in patrol zones can divide the paths with an uncrossable boundary. Ignore wide flags on the patrol zone edges to provide doorways for mechanics through these boundaries without otherwise affecting the path finding heuristic.

Fixes #5414.

Requires new network version.
 2017-05-02 08:10:09 +02:00
Michał Janiszewski 5e03fcde33 Update network version to 20 after #5423 2017-05-01 21:41:52 +02:00
zaxcav 94eb6994fb Prevent peeps walking up and back down ride queues (#5423) 
This bug is caused by inconsistent use of peep->interactionRideIndex. The primary use of this value is to record when a peep has decided to go on the ride at the queue entrance so they remember that decision when entering each queue path tile - without this they would re-decide whether to go on the ride each time they walk into a new ride queue tile.

This is also important for making the peeps walk up and back out of the queue when the ride is closed.

This value is also set when a peep decides not to go on a ride (though the reason why is not clear to me), but is not reset/changed on interaction with other tile types (e.g. shops, no entry signs, etc) causing peeps who bounce back on a ride queue entrance to walk up and down the queue.

Fixes #3499

Requires new network version.
 2017-05-01 21:29:38 +02:00
Ted John ded1a7b918 Fix #5421: Keyboard shortcuts are not working properly 
Update magic numbers, change some to actually open window instead of delegating to the top toolbar.
 2017-05-01 16:33:57 +01:00
OpenRCT2 git bot 5d4d3c6394 Merge Localisation/master into OpenRCT2/develop. 2017-05-01 04:00:22 +00:00
Ted John 53c9230142 Merge pull request #5415 from IntelOrca/feature/mute-toolbar 
Add mute button to toolbar
 2017-04-30 23:08:18 +01:00
Ted John 5067e6ac84 Update changelog 
[ci skip]
 2017-04-30 23:07:38 +01:00
Ted John 4288e13947 Change mute widget index to its more logical position 2017-04-30 22:35:47 +01:00
Ted John ae8aa2d466 Fix top toolbar tool switching 
Moved tool active checks to top toolbar so that it can use constants.
 2017-04-30 22:33:19 +01:00
Ted John 8bd0c703a7 Revert "fix and refactor DrawRLESprite2 (#5396)" as it broke water rendering 
This reverts commit fde3c8a3ed.
 2017-04-30 20:02:27 +01:00
Ted John 75e0c94082 Fix mute / unmute logic 2017-04-30 18:03:25 +01:00
Ted John 21bf897bda Adjust group box on interface options page 2017-04-30 17:46:23 +01:00
Ted John eb422a70bd Fix toolbar strings and use new icon 2017-04-30 17:37:36 +01:00
Ted John 95c9ec5f54 Add ear toolbar icon to g2 2017-04-30 17:37:36 +01:00
Pulkit 970614bd51 WIDX_MUTE Improvements 2017-04-30 17:36:38 +01:00
Pulkit 89baa54633 Fixed the whitespaces 2017-04-30 17:33:26 +01:00
Pulkit dff1d724a0 Updated the location of the mute button 2017-04-30 17:33:26 +01:00
Pulkit daf968161e Added the mute option in the toolbar 2017-04-30 17:33:26 +01:00
Pulkit f7d01e3983 Modified the Mute button Like the Cheat 
I implemented the Mute button but for some reason I am unable to enable
the checkbox. Could someone kindly look into it
 2017-04-30 17:33:26 +01:00
Pulkit 0ca023a459 Few Corrections, in the code. 2017-04-30 17:33:26 +01:00
Pulkit a0f6a3b61b Updated Position of the Mute Button 2017-04-30 17:33:25 +01:00
Pulkit ffa3896b24 Mute Button Implemented like in RCT1 
Added the Mute button, like requested in the Issue #1421.
 2017-04-30 17:33:21 +01:00
Ted John 1ab90d86ca Fix exporting non-RLE sprites 2017-04-30 17:22:27 +01:00
camthesaxman a793ac24f3 remove unused variables 2017-04-30 06:42:23 +02:00
camthesaxman 2ac8c9bad3 build the version string at compile time 2017-04-30 06:42:23 +02:00
Cameron Hall fde3c8a3ed fix and refactor DrawRLESprite2 (#5396) 2017-04-30 06:40:25 +02:00
CraigCraig e0b875398b Tons of spelling fixes (#5413) 
[ci skip]
 2017-04-30 06:39:24 +02:00
OpenRCT2 git bot b45d4f328b Merge Localisation/master into OpenRCT2/develop. 2017-04-30 04:00:18 +00:00
Harry Lam ce5e6b7df4 en-GB: "harbor" -> "harbour" (#5412) 
[ci skip]
 2017-04-29 21:18:38 +02:00
Michał Janiszewski b8bc6c7374 Bump network version to 19 2017-04-29 20:56:32 +02:00
Michał Janiszewski f58233912d Prevent execution of invalid command in track_place 2017-04-29 20:56:32 +02:00
Michał Janiszewski a5df306a84 Guard from null scenery entry 2017-04-29 20:56:32 +02:00
Michał Janiszewski 2609242780 Fix #3136: Add 255th FlatRideTrackBlock entry 
This is to guard invalid ride type from invoking an uninitialised read.
 2017-04-29 20:56:32 +02:00
Michał Janiszewski dd6e040122 Prevent access to invalid banner in game command 2017-04-29 20:56:32 +02:00
OpenRCT2 git bot ee4e863dc6 Merge Localisation/master into OpenRCT2/develop. 2017-04-29 04:00:21 +00:00
OpenRCT2 git bot 18ada57bab Merge Localisation/master into OpenRCT2/develop. 2017-04-28 04:00:25 +00:00
Michał Janiszewski bf11fdeb21 Fix #5395: Crash when no sections are present in config.ini 
Missing sections in `config.ini`, particularily `[general]` can lead to
a null pointer dereference due to some fields being uninitialised.
 2017-04-27 22:23:22 +02:00
Michael Steenbeek 92e110195e Define native file dialog strings when loading heightmap, to avoid crashes 
Thanks to @wolfreak99 for the fix.
 2017-04-27 16:02:35 +02:00
OpenRCT2 git bot 20f36ec1ee Merge Localisation/master into OpenRCT2/develop. 2017-04-27 04:00:21 +00:00
OpenRCT2 git bot f26380c5b7 Merge Localisation/master into OpenRCT2/develop. 2017-04-26 04:00:22 +00:00
Michael Steenbeek e8b5d418cd en-GB: Change another occurrence of 'normalize' 
[ci skip]
 2017-04-25 15:26:37 +02:00
Michael Steenbeek 4942b6a2df en-GB: Change 'normalize' to 'normalise' 
[ci skip]
 2017-04-25 15:23:52 +02:00
OpenRCT2 git bot 5b16e0587f Merge Localisation/master into OpenRCT2/develop. 2017-04-25 04:00:23 +00:00
Michał Janiszewski dcb1b8651b Fix scenery eye dropper checks 2017-04-24 23:25:21 +02:00
Michał Janiszewski 79cbb179c3 Fix memory leak in heightmap loader 2017-04-24 23:21:14 +02:00
Broxzier f831195884 Fix typo (neightbour -> neighbour) 
[ci skip]
 2017-04-24 23:19:51 +02:00
Broxzier d8253ef849 Add error for loading non 24-bit bitmaps 2017-04-24 23:19:51 +02:00
Broxzier b456fe2a4d Copy argument to buffer since it may be freed, add missing break 2017-04-24 23:19:51 +02:00
Broxzier 058607b4e4 transform greyscale image to RGB when loaded 2017-04-24 23:19:51 +02:00