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

5611 Commits

Author SHA1 Message Date
Ted John f767f947d1 Merge pull request #2649 from Schlumpf/fix-gitignore 
Add "*.directory" to .gitignore.
 2016-01-05 17:16:59 +00:00
Martin Kröll e3c6093145 Add to .gitignore. Important on Linux/KDE systems. 2016-01-05 17:33:33 +01:00
Ted John f4a25bd55e Merge pull request #2641 from Broxzier/fix_saving 
Prevent extension from showing when "saving as"
 2016-01-05 10:14:20 +00:00
Ted John db01fa6d60 Merge pull request #2645 from LRFLEW/typo 
Fixed typo in viewport_interaction.c
 2016-01-05 08:00:29 +00:00
LRFLEW db76615af0 Fixed typo in viewport_interaction.c 2016-01-05 00:17:10 -07:00
Ted John 79b7913b78 Merge Localisation/master into OpenRCT2/develop. 2016-01-05 04:00:19 +00:00
IntelOrca d842708f90 refactor drag widget in input.c 2016-01-05 00:10:28 +00:00
IntelOrca 88c391120a integrate tooltip variables 2016-01-05 00:02:23 +00:00
Ted John e323397574 Merge pull request #2642 from OpenRCT2/remove-tutorial 
Remove all tutorial code
 2016-01-04 23:36:55 +00:00
Hielke Morsink 3641634aad Prevent extension from showing when saving a park for the first time. 2016-01-05 00:23:51 +01:00
IntelOrca 0c933234e0 remove all tutorial code 2016-01-04 23:21:23 +00:00
IntelOrca f0adf90660 integrate variable: gInputFlags 2016-01-04 22:53:03 +00:00
IntelOrca b5069d3809 integrate variable: gInputState 2016-01-04 22:45:51 +00:00
Ted John 6f4cf119e7 Merge pull request #2629 from janisozaur/harden-game-commands 
Game commands hardening
 2016-01-04 22:14:30 +00:00
Michał Janiszewski 9c4cf14069 Game commands hardening 2016-01-04 22:03:28 +01:00
Ted John 286f89b941 Merge pull request #2638 from LRFLEW/develop 
Updated OS X shasum to new value
 2016-01-04 18:39:23 +00:00
IntelOrca 3b4928c041 fix windows file enumerate pattern matching 2016-01-04 18:29:18 +00:00
LRFLEW d371fa603e Updated OS X shasum to new value 2016-01-04 11:07:36 -07:00
Ted John 015c76084e Merge pull request #2616 from atmaxinger/autosave-timestamp 
Append timestamp to autosave
 2016-01-04 17:54:11 +00:00
IntelOrca b29a3b0823 fix appveyor 2016-01-04 17:30:49 +00:00
Maximilian Irlinger a0bb568889 Append timestamp to autosave 2016-01-04 16:22:15 +01:00
Ted John e4052b332f Merge Localisation/master into OpenRCT2/develop. 2016-01-04 04:00:18 +00:00
Ted John 047c029748 Merge pull request #2628 from OpenRCT2/new-scenarioselect 
RCT1 scenario select & sequence
 2016-01-03 21:09:22 +00:00
IntelOrca b94cd7499d add config for hide mega park and set locking as default 2016-01-03 21:06:10 +00:00
Michał Janiszewski b45ca38d52 UTC epoch time for POSIX 2016-01-03 21:41:21 +01:00
IntelOrca 99e0d999b2 add timestamp to highscores.dat 2016-01-03 01:48:52 +00:00
Ted John 4889033658 Merge pull request #2631 from janisozaur/travis-jobs 
Limit travis jobs
 2016-01-03 00:49:10 +00:00
Michał Janiszewski 5a17d6d2ec Limit travis jobs 
Leave all passing jobs commented out for future reference in hopes they
will be tested with large changes or when doing changes to CMakeLists
 2016-01-03 01:21:46 +01:00
IntelOrca 9d5e798b7a update changelog 2016-01-02 23:26:41 +00:00
LRFLEW d2653e304d Added scenario_sources.c to Xcode 2016-01-02 23:14:50 +00:00
IntelOrca 9b833e5f93 shorten path for scenario select debug 2016-01-02 23:14:41 +00:00
IntelOrca 9eacd3532b use correct window variable for highlighted scenario 2016-01-02 21:13:24 +00:00
IntelOrca ededc82cba add DLC and Build your own scenario classification 2016-01-02 21:06:46 +00:00
IntelOrca a4e919b023 fix scenario sorting for real and other parks 2016-01-02 21:06:01 +00:00
IntelOrca 2f00a28503 add Geoffrey Gardens mistake alias 2016-01-02 21:06:00 +00:00
IntelOrca 212b8bfa10 translate scenarios by raw normalised name 2016-01-02 21:06:00 +00:00
IntelOrca 5a4ad66a80 fix order of Southern Sands and Tiny Towers 2016-01-02 21:05:59 +00:00
Gymnasiast 4c6dbd0702 Add entries for RCT1/AA/LL scenarios 2016-01-02 21:05:58 +00:00
IntelOrca d147f516db fix default selected tab on scenario select 2016-01-02 21:05:57 +00:00
IntelOrca aeda8d68f9 add logic for unlocking mega park and making it invisible 2016-01-02 21:05:37 +00:00
IntelOrca 8f5a9cfade fix issue caused by not copying filename string 2016-01-02 21:05:37 +00:00
IntelOrca 9d88982138 fix mistake in scenario sources array 2016-01-02 21:05:36 +00:00
IntelOrca 3ad3113523 add alias for 'Cradle of Civilisation' 2016-01-02 21:05:35 +00:00
IntelOrca 51141a9057 refactor translation of scenarios 2016-01-02 21:05:35 +00:00
IntelOrca 868da8e450 fix title sequence issue 2016-01-02 21:05:34 +00:00
IntelOrca 82b05950ff add RCT1 title sequence 2016-01-02 21:05:33 +00:00
IntelOrca f2c5ce32f2 improve options window for scenario options 2016-01-02 21:05:33 +00:00
IntelOrca be6f7321d0 place custom real parks in real parks for source mode 2016-01-02 21:05:32 +00:00
IntelOrca 6747f20238 hardcode difficulty for original scenarios 2016-01-02 21:05:31 +00:00
IntelOrca 950722292c use user path for default scenario save location 2016-01-02 21:05:31 +00:00