OpenRCT2 git bot
f4ca5870db
Merge Localisation/master into OpenRCT2/develop.
2016-07-06 04:00:21 +00:00
Charles Cook
8b36e4c54a
Use four spaces instead of tabs in c++
2016-07-05 20:32:37 -04:00
Charles Cook
6d268099f5
Follow coding standard for project.
2016-07-05 19:40:20 -04:00
Charles Cook
5c9110b99a
Prevent viewport_invalidate from causing covered viewports to redraw and cache window and viewport visibility.
2016-07-05 18:02:23 -04:00
Charles Cook
19d873fedf
Prevent rendering of hidden windows.
2016-07-05 12:54:28 -04:00
Michał Janiszewski
f3786b3130
Fix #3899 : Game crashes after hosting my server
...
Catch exceptions when loading groups.json.
2016-07-04 17:50:09 +01:00
OpenRCT2 git bot
b4886d5088
Merge Localisation/master into OpenRCT2/develop.
2016-07-04 04:00:21 +00:00
Sven Slootweg
b343db3948
Fix incorrect variable name in posix.c log statement ( #3980 )
2016-07-03 22:20:36 +02:00
OpenRCT2 git bot
13ecd3532c
Merge Localisation/master into OpenRCT2/develop.
2016-07-03 04:00:21 +00:00
Matte A
a9dbae642e
Changelog: add implementation of the user-defined currency ( #3966 )
2016-07-02 17:59:22 +02:00
Daniel Trujillo Viedma
3122448b86
Fix #3969 : Custom currency's gets reset when closing the game
...
Custom currency loading code was being called from a not usually reached
place.
2016-07-02 16:46:49 +01:00
Ted John
c06296178a
Merge pull request #3952 from gDanix/custom-currency
...
Implement custom currencies.
2016-07-02 13:46:08 +01:00
Daniel Trujillo
3745d3fa95
Remove unused include
2016-07-02 12:14:01 +02:00
Daniel Trujillo
1fc75131a4
Move call to load custom currency preferences to config_open_default()
2016-07-02 12:12:44 +02:00
OpenRCT2 git bot
ebf876c8a8
Merge Localisation/master into OpenRCT2/develop.
2016-07-02 04:00:21 +00:00
Daniel Trujillo
a29db378eb
Move loading custom currency-related preferences code into currency.c
2016-07-01 23:52:33 +02:00
Daniel Trujillo
4ebcf80a1a
Redefine what is a "large" currency.
...
Decimals currencies does make sense when 10 < rate < 100, so it's
neccesary to raise the limit before hiding decimals
2016-07-01 22:02:28 +02:00
Daniel Trujillo
fc6f4929b7
Refactor for compliance with coding standards.
2016-07-01 22:02:28 +02:00
Daniel Trujillo
f61da89410
Delete useless 'invalidate' function.
2016-07-01 22:02:28 +02:00
Daniel Trujillo
036b09d916
Several fixes.
...
· Delete 1 remaining useless comment
· Move static function definitions above window events definition
· Replaced 'invalidate' function with window_invalidate_all()
2016-07-01 22:02:28 +02:00
Daniel Trujillo
6a3210b7b7
Remove useless comments.
2016-07-01 22:02:28 +02:00
Daniel Trujillo
dfd78ec359
Perform a refactor for compliance with conding style.
2016-07-01 22:02:28 +02:00
Daniel Trujillo
cb1f9269a6
Hide useless decimals in custom currency configuration window
2016-07-01 22:02:28 +02:00
Daniel Trujillo
a17061cfb6
Set default custom currency rate to 10, as GBP
2016-07-01 22:02:28 +02:00
Daniel Trujillo
6ce4584842
Fix the currency equivalence bug
...
The custom currency configuration window was showing an incorrectly
equivalence ratio between GBP and the custom currency.
2016-07-01 22:02:28 +02:00
LRFLEW
bc01d91930
Updated Xcode Project for #3952
2016-07-01 22:02:28 +02:00
Daniel Trujillo
f4d5cc0e28
Add new created sorce file to the VS project file
2016-07-01 22:02:28 +02:00
Daniel Trujillo
cef8eef177
Add Pound symbol to the "equivalent" string
2016-07-01 22:02:28 +02:00
Daniel Trujillo
8ef1e1669d
Add a missing include.
...
That was preventing from building on OSX and Win
2016-07-01 22:02:28 +02:00
Daniel Trujillo
d69ab15557
Revert changes in es-ES.txt
2016-07-01 22:02:28 +02:00
Daniel Trujillo
8412433683
Vanity card
2016-07-01 22:02:28 +02:00
Daniel Trujillo
4a28f7f6aa
Clean code in custom_currency.c
...
To make it more OpenRCT coding style compliant
2016-07-01 22:02:28 +02:00
Daniel Trujillo
b12e5443e9
Add configuration support for the custom currency
...
This commit do several things:
· Add proper entries to config.c file
· Load custom currency definition at start time
· Save every change made from the custom currency configuration window
2016-07-01 22:02:28 +02:00
Daniel Trujillo
71a32a8750
Create custom currency configuration window
2016-07-01 22:02:28 +02:00
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