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
8,075 Commits 8 Branches 59 Tags
9e730c2ba7f2783e78e7e427535bd99fa5f7bc06
Commit Graph

8075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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