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

11205 Commits

Author SHA1 Message Date
wolfreak99 33bc414bab Sync "Raise / lower initial guest thirst" 2017-04-11 14:26:33 +02:00
wolfreak99 6baf971eba Sync "Raise / lower guest initial hunger" 2017-04-11 14:26:32 +02:00
wolfreak99 48ad60308e Sync "Raise / lower guest initial happiness" 2017-04-11 14:26:32 +02:00
wolfreak99 c0dc1718a4 Sync "Raise / lower guest initial happiness" 2017-04-11 14:26:32 +02:00
wolfreak99 d21d500b4a Sync "Set forbid marketing campaigns" 2017-04-11 14:26:32 +02:00
wolfreak99 2a8481bd48 Sync "Raise / lower interest rate" 2017-04-11 14:26:31 +02:00
wolfreak99 8c07613eed Sync "Raise / lower maximum loan size" 2017-04-11 14:26:31 +02:00
wolfreak99 e096314f89 Sync "Raise / lower initial loan size" 2017-04-11 14:26:31 +02:00
wolfreak99 0932854f7c Sync "Raise / lower initial cash" 2017-04-11 14:26:30 +02:00
wolfreak99 a3b1175ed6 Sync "Set no money" 2017-04-11 14:26:30 +02:00
wolfreak99 28c61e7068 Prepare scenario options sync 2017-04-11 14:26:25 +02:00
Michał Janiszewski a7e6c6ab24 Update network version to 15 2017-04-11 10:23:37 +02:00
wolfreak99 fb62ed8ae2 Add "Quick demolish mode" to the Rides List 
Taken from the "Quick fire mode" on the Staff List
 2017-04-11 10:16:44 +02:00
OpenRCT2 git bot 998a05d217 Merge Localisation/master into OpenRCT2/develop. 2017-04-11 04:00:23 +00:00
Gymnasiast b595fea770 Fix Z-sorting issues with Giga Coaster boosters 2017-04-10 21:11:52 +02:00
Gymnasiast 3ad6af679a Draw booster sprites on Steel Twister, Vertical RC and Giga Coaster, fixes #5351 2017-04-10 20:31:47 +02:00
Michael Steenbeek caa9655617 Merge pull request #5352 from OpenRCT2/set-rct1-path 
Add menu option to set RCT1 path
 2017-04-10 17:00:47 +02:00
Martin Müller ae0c85f009 Add tooltip to the label and warn that restart is required 2017-04-10 14:10:54 +02:00
Martin Müller 3409da9aa1 Only load csg1 if necessary 2017-04-10 14:09:01 +02:00
Martin Müller da1f618732 If path to RCT1 is available, load "css50" from there 2017-04-10 14:09:01 +02:00
Martin Müller b1bd899fb8 Add menu option for path to RCT 1 2017-04-10 14:08:58 +02:00
OpenRCT2 git bot ae2e94ce54 Merge Localisation/master into OpenRCT2/develop. 2017-04-10 04:00:23 +00:00
Ted John 5766e5fc33 Remove Windows code sign certificate 
Certificate provided @JarnoVgr has now expired.
 2017-04-09 11:23:38 +01:00
OpenRCT2 git bot d55258608b Merge Localisation/master into OpenRCT2/develop. 2017-04-09 04:00:24 +00:00
OpenRCT2 git bot 1639f614f1 Merge Localisation/master into OpenRCT2/develop. 2017-04-08 04:00:16 +00:00
Marijn van der Werf c7115273da Allow some warnings on macOS builds 2017-04-07 22:10:14 +02:00
Marco Benzi Tobar 67b4d919b4 Update the window size when using maximise on macOS 2017-04-07 17:09:11 +02:00
Michael Steenbeek 08ccdd6bf0 Fix Top Spin description typo from #5345 
[ci skip]
 2017-04-07 08:42:11 +02:00
Tom Delebo e9c4365aa2 Add description and greeting textbox to server start menu 2017-04-06 14:31:36 +02:00
OpenRCT2 git bot 1659a93552 Merge Localisation/master into OpenRCT2/develop. 2017-04-06 04:00:18 +00:00
Richard Jenkins 1cfc1b003b Fix scenery eyedropper not picking up selected item's rotation (referenced in #5339) (#5344) 2017-04-05 12:33:59 +01:00
Michał Janiszewski 07d943575d Fix invalid array size in platform_open_directory_browser 2017-04-04 22:10:23 +02:00
Michał Janiszewski 8cd704eca7 Guard array access in platform_open_directory_browser 2017-04-04 22:07:50 +02:00
duncanspumpkin d305925cde Fix #5334. Make signs save text in the correct order. 
Mistake made during refactoring that would cause the sign text to be in the wrong order. If the text was less than 12 characters sign would be blank.
 2017-04-04 20:05:10 +01:00
OpenRCT2 git bot 447153ccfb Merge Localisation/master into OpenRCT2/develop. 2017-04-04 04:00:19 +00:00
Ted John 9c4c7e7b23 Merge pull request #5319 from IntelOrca/refactor/fountain-cpp 
Refactor fountain to C++
 2017-04-03 21:53:33 +01:00
LRFLEW 3b21b521dd Update Xcode Project 2017-04-03 14:45:34 -05:00
Michał Janiszewski f0b8a514fa Update network version to 13 2017-04-02 23:00:00 +02:00
GrahamRCT 29db1389ce Relative value bonus for new rides 
This prevents, for instance, charging $6 for any new ride, regardless of its quality.
 2017-04-02 22:52:59 +02:00
Michael Steenbeek c9c3025e2e Merge pull request #5305 from IntelOrca/feature/scenery-eyedropper-tool 
Add scenery eyedropper tool
 2017-04-02 22:45:28 +02:00
Gymnasiast 9efbf9c60e Only show 'Force breakdown' when not in network mode, fixes #5199 2017-04-02 19:35:25 +02:00
Michał Janiszewski cf87760b60 Fix #5325: Crash from invalid ride type in research_finish_item 2017-04-02 15:35:27 +02:00
Margen67 10d1e8a538 Disable clearance checks for underwater and underground walls 
Also update network version.
 2017-03-31 09:38:03 +02:00
Gymnasiast ea7f1f03e7 Raise limit of objects per tab to 256 2017-03-29 23:04:30 +02:00
Richard Jenkins 4da7e203ca Improve clarity of scenario difficulty option text 2017-03-28 21:42:18 +02:00
David CARLIER d50a1592fa Prevent double allocations of string allocated config values 
Prevent double allocations of string allocated config values since they can be set by default and then set again by reading the config file.
 2017-03-28 10:32:22 +02:00
Richard Jenkins 5b685d5cad Don't apply peep_make_passing_peeps_sick() to peeps in a queue, fixes #1992 2017-03-28 09:24:42 +02:00
Richard Jenkins d58f761721 Improve algorithm for determining zoom level in track previews, fixes #3502 2017-03-28 09:23:46 +02:00
Michał Janiszewski 1f78afead9 Prevent dereferencing null map element in footpath_remove_real 
No network version increase as the client would simply crash if it were
NULL.
 2017-03-27 22:09:46 +02:00
zaxcav 071c8135ba Update ride_find_closest_mechanic() to search using the station exit location, fixes #5284 2017-03-27 20:00:50 +02:00