mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 12:03:07 +01:00
Code Issues Releases Wiki Activity
8,089 Commits 8 Branches 59 Tags
50c2e52b57bc6cd3bebc2df19eb9e426cb2a18a2
Commit Graph

8089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
duncanspumpkin
50c2e52b57 Use better text descriptions. Holding down rate buttons now increase/decrease 2016-07-10 09:26:23 +01:00
duncanspumpkin
1d4fb5cb6f Allow rate input by text box 2016-07-09 08:39:45 +01:00
duncanspumpkin
4fa10b049b Fix #3999. Animated objects correctly apply secondary colours 2016-07-09 08:05:25 +01:00
OpenRCT2 git bot
05540cfef0 Merge Localisation/master into OpenRCT2/develop. 2016-07-09 04:00:22 +00:00
Ted John
76b2621a51 Merge pull request #4000 from SijmenSchoon/develop 
Add a "default" button to the loadsave window
 2016-07-08 22:58:07 +01:00
Josue Acevedo
bfce74f905 Minor fix: guest list not contain any guest. (#4016) 
Mistake that I made accidentally in #4006, caused because selected page takes the -1 value if the num of pages is 0 (it only happens if the num of guests is 0).
 2016-07-08 23:57:26 +02:00
Duncan
9af54d0fd7 Merge pull request #4015 from SijmenSchoon/ferris_prison 
Fix #4003: Fix the closing of ferris wheels
 2016-07-08 22:45:27 +01:00
Sijmen Schoon
d06633331a Fix the closing of ferris wheels 
Well, that was anticlimactic
 2016-07-08 23:36:59 +02:00
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
Sijmen Schoon
511ce8f06a Sort includes 2016-07-08 15:21:08 +02:00
Sijmen Schoon
66628e5131 Remove unused variable 2016-07-08 11:32:34 +02:00
Sijmen Schoon
662d92be74 Fix track load/save last-dir storing 
Doesn't really belong to this PR, but it's needed anyway
 2016-07-08 11:29:45 +02:00
Sijmen Schoon
2d7cd0e719 Change string ids to be consecutive 2016-07-08 11:29:02 +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
Sijmen Schoon
47d69998e7 Straighten up window_loadsave_widgets 2016-07-07 11:50:06 +02:00
Sijmen Schoon
127d94d451 Add a default button to the loadsave window 2016-07-07 11:29:22 +02: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