mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
11,083 Commits 9 Branches 41 Tags 390 MiB
Commit Graph

11083 Commits

Author SHA1 Message Date
Ted John cdffd6116d Fix non-network builds 2017-03-08 20:45:49 +00:00
Ted John e960da95e2 Add a workaround for MINGW 2017-03-08 20:39:45 +00:00
Ted John e81094ee60 Fix loading parks by command line with non standard extensions 2017-03-08 19:06:42 +00:00
Ted John 0ec43e3611 Improve String::Split and add tests 2017-03-08 19:06:42 +00:00
Ted John 7ccce750a6 Use std::string instead of char * for UriHandler 2017-03-08 19:06:42 +00:00
Ted John 925d64249f Add openrct2:// uri scheme support 
This sets up a URI scheme for openrct2 for Windows by adding the necessary registry keys. This is done on startup every time to keep the binary location up to date. URI handling currently supports joining a server.
 2017-03-08 19:06:42 +00:00
Ted John 5a850cd155 Add some useful string functions 2017-03-08 19:06:42 +00:00
OpenRCT2 git bot 2e37d6e427 Merge Localisation/master into OpenRCT2/develop. 2017-03-08 04:00:25 +00:00
Michał Janiszewski 8087fc6a17 Bump network version as a result of 5bd44a6d3f 2017-03-07 22:49:33 +01:00
duncanspumpkin 5bd44a6d3f Fix #5265. Queue TV's now correctly detected. 
Due to a mistake when implementing only ghost queue TV's were used for increasing peep happiness
 2017-03-07 21:13:45 +00:00
duncanspumpkin 8bd374f9dd Fix #5275. Door animations now play correctly. 
Mistake caused when refactoring. I did some copy paste coding and forgot to test it. On top of that mistakenly thought 0x30 >> 3 = 12 when it equals 6.
 2017-03-07 19:44:14 +00:00
Michał Janiszewski 7341f4aadd Remove trailing whitespace 
[ci skip]
 2017-03-07 20:38:11 +01:00
Duncan bb938054c7 Merge pull request #5274 from IntelOrca/refactor/wall-cpp 
Clean up wall.cpp
 2017-03-07 19:10:22 +00:00
YoloSweggLord 16bef6044f LIM sprites for giga and steel twister track 2017-03-07 13:42:44 +01:00
LRFLEW 6d2776da2b Merge pull request #5279 from LRFLEW/case-insensitive-ini 
Make the INI keys case insensitive
 2017-03-06 22:52:02 -06:00
OpenRCT2 git bot 38bc6f82e3 Merge Localisation/master into OpenRCT2/develop. 2017-03-07 04:00:24 +00:00
Michał Janiszewski 6181d968e8 Add case insensitive test to INI tests 2017-03-06 22:28:33 +01:00
LRFLEW 8e55b6ef22 Make the INI keys case insensitive 2017-03-06 09:22:44 -06:00
OpenRCT2 git bot 8bd10df859 Merge Localisation/master into OpenRCT2/develop. 2017-03-05 04:00:20 +00:00
Ted John c5a999415c Clean up wall.cpp 
* Trim trailing spaces
* Tab to space
* Conform more to C++ code style
 2017-03-04 12:13:24 +00:00
OpenRCT2 git bot a33752e1e3 Merge Localisation/master into OpenRCT2/develop. 2017-03-04 04:00:21 +00:00
wolfreak99 1549467c6c Fix "allow more peep spawns" 2017-03-03 16:48:35 +01:00
Joël Troch 8167ff9678 Fix #1730: Add keyboard shortcuts for track construction (#5200) 2017-03-03 09:35:42 +01:00
OpenRCT2 git bot 4aa44e15c6 Merge Localisation/master into OpenRCT2/develop. 2017-03-03 04:00:22 +00:00
wolfreak99 38f264cce8 Allow for more peep spawns in the future 2017-03-02 23:02:54 +01:00
OpenRCT2 git bot 2da540ba5c Merge Localisation/master into OpenRCT2/develop. 2017-03-02 04:00:23 +00:00
OpenRCT2 git bot 6b3b4949fe Merge Localisation/master into OpenRCT2/develop. 2017-03-01 04:00:17 +00:00
Michael Steenbeek 8e1794b032 en-GB: Fix americanism 2017-02-28 17:07:26 +01:00
Michael Steenbeek ae978575f9 Fix spelling of 'Conger Eel', fixes #5252 2017-02-28 09:40:12 +01:00
wolfreak99 c6b5053261 Add cooldowns to help prevent mass demolishing 2017-02-28 09:31:26 +01:00
Duncan 1654ba4fe4 Merge pull request #5236 from duncanspumpkin/refactor 
Refactor fence to wall
 2017-02-28 06:56:06 +00:00
Michał Janiszewski 7f48df20ec Refactor input 2017-02-27 20:20:41 +01:00
Ted John 4442b936de Merge pull request #5256 from chfast/memory-fixes 
Small memory fixes
 2017-02-27 17:24:08 +00:00
Hielke Morsink 4ea29bbf80 Close conflicting windows in main menu 
* The main buttons close the other main windows in the main menu

* Only close other windows if the next is not open already
 2017-02-26 13:24:35 +01:00
duncanspumpkin ece3be303c Fix formating 2017-02-26 09:04:32 +00:00
OpenRCT2 git bot 3a0318ff04 Merge Localisation/master into OpenRCT2/develop. 2017-02-26 04:00:16 +00:00
duncanspumpkin adab7f7a6d Add set animation frame function 2017-02-25 09:36:28 +00:00
duncanspumpkin 7691dc3c10 Use functions to set and get secondary colour 2017-02-25 09:19:31 +00:00
OpenRCT2 git bot e8a7f9a065 Merge Localisation/master into OpenRCT2/develop. 2017-02-25 04:00:17 +00:00
Ted John af7af61536 Merge pull request #5240 from IntelOrca/refactor/config-cpp-2 
Refactor config
 2017-02-25 01:35:03 +00:00
Duncan 867b4523d2 Merge pull request #5259 from duncanspumpkin/force_rat 
Add force commands for ratings
 2017-02-24 23:19:24 +00:00
Michał Janiszewski d610ef5447 Remove unnecessary libs from linking to tests 
[ci skip]
 2017-02-25 00:10:27 +01:00
Michał Janiszewski e39444b592 Add more test cases to StringTest 2017-02-25 00:07:45 +01:00
Michał Janiszewski 62ab0e0e03 Add missing include to IniReaderTest 2017-02-25 00:07:45 +01:00
Ted John f851198645 Fix and format test data 2017-02-24 23:01:06 +00:00
Ted John fe2cb79d18 Use strings for test data in IniReaderTest 2017-02-24 22:57:32 +00:00
Michał Janiszewski 7d0cc83908 Add tests for untrimmed INI 2017-02-24 23:39:01 +01:00
Michał Janiszewski 3b3f0b2e6b Return actual instead of default value in IniReader::GetString 2017-02-24 23:39:01 +01:00
Michał Janiszewski 5f43c37ca0 Add String test to CMake 2017-02-24 23:04:36 +01:00
Michał Janiszewski d41293fa6b Extract common test sources into library 2017-02-24 23:04:20 +01:00