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

8126 Commits

Author SHA1 Message Date
Daniel Trujillo 5302ebd951 Revert "Add other-than-selected currency support to format_currency_2dp" 
This reverts commit 98d5b332bd9958296218a66e2eb7ef61600c8086.
 2016-07-01 22:02:28 +02:00
Daniel Trujillo 140b4f73aa Add other-than-selected currency support to format_currency_2dp 
This commit adds support for formatting currency strings using other
than the selected currency.
 2016-07-01 22:02:28 +02:00
Daniel Trujillo 187499fd72 Fix currency dropdown not showing checked custom currency. 
Due to the dropdown separator before custom currency entry, the selected
item index was incorrectly assigned to the separator.
 2016-07-01 22:02:28 +02:00
Daniel Trujillo 9355eef5d4 Add custom currency option 
Add custom currency entry to the dropdown menu of the options window
 2016-07-01 22:02:28 +02:00
Daniel Trujillo 7d53b065dd Add custom currency 
Add the corresponding entry inside CurrencyDescriptors array, and made
it
non-const to let the rate and other properties to change.

Also, a language string (STR_5880, en-GB & es-ES) has been added.
 2016-07-01 22:02:28 +02:00
Maarten Peters 09863a4c01 Added fixes and improvements of the past month to the changelog (#3912) 2016-06-30 09:22:56 +02:00
OpenRCT2 git bot d77a198f7c Merge Localisation/master into OpenRCT2/develop. 2016-06-30 04:00:21 +00:00
OpenRCT2 git bot f70d1f4dd7 Merge Localisation/master into OpenRCT2/develop. 2016-06-29 04:00:18 +00:00
OpenRCT2 git bot 0272af2fb2 Merge Localisation/master into OpenRCT2/develop. 2016-06-28 04:00:19 +00:00
Duncan 5fb99b037f Merge pull request #3893 from wolfreak99/ObjectSelectionFilters 
Filter Object Selection Window by "Selected only" and "Non-selected only"
 2016-06-27 21:07:57 +02:00
wolfreak99 f9f0df82e5 refactor dropdown index to enum 2016-06-27 13:32:43 -04:00
OpenRCT2 git bot be9d2c10b3 Merge Localisation/master into OpenRCT2/develop. 2016-06-27 04:00:19 +00:00
OpenRCT2 git bot 89db25eea0 Merge Localisation/master into OpenRCT2/develop. 2016-06-26 04:00:32 +00:00
Ted John 2e3500ee6b Merge pull request #3951 from janisozaur/revert-3897 
Revert #3897
 2016-06-24 23:40:25 +01:00
Michał Janiszewski 42d6c8de4f Define NO_RCT2 for non-x86 platforms 2016-06-24 23:25:40 +02:00
Michał Janiszewski 35676d31f7 Integrate path variables used by game 2016-06-24 23:25:40 +02:00
Michał Janiszewski 199d0f03d8 Integrate some scenario variables 
gScenarioTicks is still being used in some of native code
 2016-06-24 23:25:40 +02:00
Michał Janiszewski 761fdfb7c0 Integrate gTotalNoImages 2016-06-24 23:25:40 +02:00
Michał Janiszewski 6c28df8250 Integrate gTypeToRideEntryIndexMap 2016-06-24 23:25:40 +02:00
Ted John b1eb071b64 print NO_RCT2 flag in version info for binary confidence 2016-06-24 23:25:40 +02:00
Ted John d9bcf2d946 remove RCT2 memory checksum for Win32 NO_RCT2 2016-06-24 23:25:40 +02:00
Michał Janiszewski 683eee827e Refactor gX.dat loading, make sure g2.dat loads too 2016-06-24 23:25:40 +02:00
Michał Janiszewski 1d0a9f212d Make config_apply_to_old_addresses empty for NO_RCT2 2016-06-24 23:25:40 +02:00
Michał Janiszewski 5e30733993 revert fixes 2016-06-24 22:40:37 +02:00
Michał Janiszewski dfa482b1b5 Revert "Merge pull request #3897 from janisozaur/rebase-no-rct2" 
This reverts commit 22c0cc92e6, reversing
changes made to 7b421c8052.
 2016-06-24 22:40:37 +02:00
Michał Janiszewski fbd4c8be49 Revert "Merge pull request #3930 from janisozaur/fix-3923" 
This reverts commit 9f2f7c6b68, reversing
changes made to 27b74dff72.
 2016-06-24 22:40:37 +02:00
Michał Janiszewski 0b50ce44f1 Revert "Merge pull request #3937 from janisozaur/fix-3897" 
This reverts commit d892f6b683, reversing
changes made to c487e1278b.
 2016-06-24 22:40:37 +02:00
Michał Janiszewski ac3d0a244d Revert "fix loading of large scenery objects" 
This reverts commit 00bc8fadc4.
 2016-06-24 22:40:37 +02:00
Michał Janiszewski 1711d52c18 Revert "free initial object chunk" 
This reverts commit 9b958bfb47.
 2016-06-24 22:40:37 +02:00
Michał Janiszewski 032c0d67aa Revert "fix loading of STEX object chunks" 
This reverts commit 3275c44bbb.
 2016-06-24 22:40:37 +02:00
Michał Janiszewski 1b0a73c1cd Revert "fix loading of footpath chunks" 
This reverts commit 46bf0a47d9.
 2016-06-24 22:40:37 +02:00
Ted John 080f470ef1 suppress invalid header in legacy scores for initial file 2016-06-23 22:20:26 +01:00
Ted John 46bf0a47d9 fix loading of footpath chunks 2016-06-23 22:06:48 +01:00
Michał Janiszewski da08b963c9 Check RLE chunk size 2016-06-23 21:50:23 +01:00
Ted John 17f8f9fabd remove rct_plugin_header size assertion 2016-06-23 20:20:09 +01:00
Michał Janiszewski 9041551b97 Guard server against null signature 2016-06-23 20:09:56 +01:00
Ted John ff247ca5de force an object cache update 
Due to previous issues, object caches are likely corrupt, so force an update using a new version identifier
 2016-06-23 19:52:32 +01:00
Ted John 3275c44bbb fix loading of STEX object chunks 2016-06-23 19:43:21 +01:00
Michał Janiszewski bee6bcd1c7 Verify size in sawyercoding_read_chunk 2016-06-23 19:00:54 +01:00
Ted John 9b958bfb47 free initial object chunk 2016-06-23 18:59:55 +01:00
Ted John 00bc8fadc4 fix loading of large scenery objects 2016-06-23 18:26:55 +01:00
Ted John d892f6b683 Merge pull request #3937 from janisozaur/fix-3897 
Fix #3897
 2016-06-22 22:28:17 +01:00
Michał Janiszewski 803f334b44 Make sure all of object_type_large_scenery_load gets copied 2016-06-22 21:37:44 +02:00
Michał Janiszewski 6e35eac6f8 Update fields in rct_small_scenery_entry_32bit 2016-06-22 21:37:44 +02:00
wolfreak99 2960338268 numObjects to gInstalledObjectsCount 2016-06-21 15:15:01 -04:00
wolfreak99 08b5a1dc22 Switch from bools to filter_flags 2016-06-21 14:59:13 -04:00
wolfreak99 b587b15ddd Formatting improvements (pt 1) 2016-06-21 14:30:07 -04:00
wolfreak99 4afdf20f14 Do not show selected and non-selected in track manager mode (as track manager is a single-select interface) 2016-06-21 10:16:51 -04:00
Gymnasiast c487e1278b Allow most steep inclines for the Junior RC 2016-06-20 20:08:11 +02:00
Michał Janiszewski 644a36a310 Fixes to -Wall compilation 
By default, not all warnings are enabled. This change makes sure that
the project compiles correctly with following options turned on:

    -Wall -Wno-unused-but-set-variable -Wno-missing-braces \
    -Wno-unknown-pragmas -Wno-unused-function
 2016-06-20 13:46:27 +01:00