mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 13:03:11 +01:00
Code Issues Releases Wiki Activity
12,942 Commits 8 Branches 59 Tags
ac8eaaee62ebc69f364bec2e8f7f53d0af2d9844
Commit Graph

12942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron van Geffen
ac8eaaee62 Add extra padding to dropdowns and menus. 2017-10-22 22:00:49 +02:00
Michał Janiszewski
cda5d377ca Validate draw calls for vehicles 2017-10-22 21:50:44 +02:00
Aaron van Geffen
01b92b06fd Take line heights into account in Error windows. 2017-10-22 21:48:09 +02:00
Aaron van Geffen
4fe70294e2 Take line heights into account in About and Music Credits windows. 2017-10-22 21:48:09 +02:00
Aaron van Geffen
9984fcac88 Set default TTF font heights to more sensible values. 2017-10-22 21:47:17 +02:00
Ted John
1f605db54b Extract RLE repeat to its own method 2017-10-22 16:21:13 +02:00
Ted John
a737848e8e Remove old C decoding functions and fix tests 2017-10-22 16:21:13 +02:00
Ted John
8d1710d798 Fix #6460: Crash when reading corrupt object files 
- Move sawyer coding functions to SawyerChunkReader.
- Replace assertions with exceptions to prevent crash on invalid chunks.
 2017-10-22 16:21:13 +02:00
OpenRCT2 git bot
5c98c7ee5e Merge Localisation/master into OpenRCT2/develop. 2017-10-22 04:00:35 +00:00
Alvar
7ac4bf669a Add NixOS to 'Downloading the game' list 2017-10-21 15:49:27 +02:00
TELK
1043be5bd5 Fix Twitch config not being read correctly 2017-10-21 09:42:41 +02:00
OpenRCT2 git bot
34fe5ac976 Merge Localisation/master into OpenRCT2/develop. 2017-10-21 04:00:25 +00:00
OpenRCT2 git bot
46961f1813 Merge Localisation/master into OpenRCT2/develop. 2017-10-20 04:00:23 +00:00
Michał Janiszewski
69914b3078 Mark templates as static 2017-10-19 23:57:30 +02:00
Liam Parker
b2a781dc1d Fix #6518: Correctly load guest left park from config 
OpenRCT2 was reading a "guest_entered_left_park" value for the notification setting.

The value is saved as "guest_left_park" however. Mistake made during refactor.
 2017-10-19 21:58:49 +01:00
Aaron van Geffen
9f67fafc43 Add theme support for console background colour. 2017-10-19 21:26:53 +02:00
Aaron van Geffen
a0fb2a6d7c Fix game console overflowing when using TTF for rendering. 2017-10-19 21:26:53 +02:00
Michał Janiszewski
35644a66e0 Fix android build 2017-10-19 10:48:25 +02:00
Michał Janiszewski
8fd2266bda Refactor includes (#6512) 
* Refactor Intent.h inclusion

* Use forward declaration of ITcpSocket

* Remove unused include

* Forward declare rct_ride_entry

* Remove unused headers

* Forward-declare rct_drawpixelinfo

* Remove unused headers

* Lower header include from header to source file

* Reduce included headers

* Reduce includes
 2017-10-19 10:01:05 +02:00
OpenRCT2 git bot
814b28c814 Merge Localisation/master into OpenRCT2/develop. 2017-10-19 04:00:26 +00:00
Marijn van der Werf
bcb6b83a7d Fix #6514: Groupbox titles break format arguments 2017-10-18 21:55:20 +02:00
blackhand1001
ce0650daf5 Change min energy cheat to the correct min value 32. 
Change min energy cheat to the correct min value 32. This fixes the issue with the min energy cheat that causes it to reset to 255 a few seconds after applying it.
 2017-10-18 21:52:46 +02:00
Duncan
d224f1219e Reintroduce error titles to game actions. Small refactor. (#6462) 
* Reintroduce error title to game actions. Small refactor.

Removed setting error titles in any calling functions.
Refactored place park entrance result to conform with other game actions.

* Remove unread variable (fixing Travis)
 2017-10-18 19:57:36 +01:00
Robert Jordan
ec22d04089 Fix #6470: Title sequence naming issues 
Predefined title sequence filenames are now treated as "reserved".
Custom title sequences cannot use reserved names and an error will
appear if the user tries.

Duplicating predefined title sequence now uses default text of
predefined sequence's proper name instead of filename.

Renamed `WIDX_TITLE_EDITOR_RENAME_SAVE_BUTTON` to
`WIDX_TITLE_EDITOR_RENAME_BUTTON` to follow formatting of other preset
button ids.

Added string id 6154, `STR_ERROR_RESERVED_NAME`, "Name is reserved".
 2017-10-18 11:18:14 +02:00
Aaron van Geffen
d6ee66acb4 Split/rename ROW_HEIGHT constant into widget-specific ones. 2017-10-18 11:17:22 +02:00
Aaron van Geffen
7e9a5bbb6b Increase padding for finances summary and marketing tab. 2017-10-18 11:17:22 +02:00
Michael Steenbeek
ac7652f61d Create define for MONEY16_UNDEFINED 2017-10-18 08:06:16 +02:00
Michael Steenbeek
79365b7a91 Merge pull request #6075 from marijnvdwerf/ui/text-paint 
Refactor text painting
 2017-10-18 07:49:13 +02:00
OpenRCT2 git bot
a7ff610c4b Merge Localisation/master into OpenRCT2/develop. 2017-10-18 04:00:32 +00:00
Michał Janiszewski
1d1fc42836 Update Travis Xcode image to version 8.3 
This is in preparation for soon deprecation of Xcode 8 image:
https://blog.travis-ci.com/2017-10-16-a-new-default-os-x-image-is-coming
 2017-10-17 22:31:37 +02:00
Christian F. Coors
e5ce3859a3 Fix Intent pointers/strings 2017-10-17 22:31:05 +02:00
Marijn van der Werf
fcfa4ffcc2 Apply requested changes 2017-10-17 22:24:34 +02:00
Michael Steenbeek
221e42b56e Merge pull request #6505 from Gymnasiast/refactor/track-c 
Compile track.c as C++, fix preview Z offsets
 2017-10-17 19:51:15 +02:00
Michael Steenbeek
08929b8b19 Fix missed -1 pointer comparisons 2017-10-17 17:05:57 +02:00
Michael Steenbeek
a23a40b447 Fix alignment and include order 2017-10-17 16:16:20 +02:00
Michael Steenbeek
0cb1e57cc6 Fix preview Z offset table entries 2017-10-17 13:59:57 +02:00
Michael Steenbeek
a1621e4eb1 Track.cpp and Track.h: fix formatting 2017-10-17 13:55:53 +02:00
Michael Steenbeek
bb01699b7d Compile track.c as C++ 2017-10-17 13:51:47 +02:00
Aaron van Geffen
60aa849a83 Increase height for items in shortcuts window. 
This increases the height for each item in the keyboard shortcuts window from 10px to 12px.
While this may not seem like much, it ensures the text no longer overlaps for Japanese and Korean.
At also has the added benefit of making the window look a bit nicer for Western languages.
 2017-10-17 11:39:24 +02:00
Michał Janiszewski
6695a4ce13 Fix #6497: Boat hire boats do not return to station 
Credit goes to @duncanspumpkin
 2017-10-17 10:17:39 +02:00
OpenRCT2 git bot
2ec1c71c9f Merge Localisation/master into OpenRCT2/develop. 2017-10-17 04:00:34 +00:00
Arnav Borborah
8271da85a2 Fix arguments to main() 2017-10-17 00:04:40 +02:00
Michael Steenbeek
6a66ef8668 Merge pull request #6442 from janisozaur/vehicle-cpp 
Compile vehicle.c as C++
 2017-10-16 17:15:43 +02:00
Michał Janiszewski
9ca73ffde2 Compact the switch statement 2017-10-16 10:42:40 +02:00
Michał Janiszewski
5843d72ece Add comment explaining commented out code 
[ci skip]
 2017-10-16 10:19:47 +02:00
Robert Jordan
9d5c6a4127 Use proper names for predefined themes 
Predefined themes *RCT1* and *RCT2* will now be called their respective
game name*RollerCoaster Tycoon 1* or *RollerCoaster Tycoon 2* in the
current language.

Predefined themes in the config file now are prefixed with an asterisk
like they are supposed to be. AKA `*RCT1` instead of `RCT1`.

This will invalidate the user's currently selected theme in the config
file, but only if they were using RCT1's theme.
 2017-10-16 10:04:09 +02:00
Christian F. Coors
e1d24641a4 Fix saving without dialog in new scenario 2017-10-16 08:07:10 +02:00
OpenRCT2 git bot
a31add2141 Merge Localisation/master into OpenRCT2/develop. 2017-10-16 04:00:30 +00:00
Aaron van Geffen
08f7aba817 Rename 'blend' function to 'blendColours'. 2017-10-15 22:31:11 +02:00
Aaron van Geffen
346d1a6fbf Add changelog entry. 2017-10-15 22:31:11 +02:00