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

11056 Commits

Author SHA1 Message Date
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
Ted John 3b341de835 Fix String::Trim and add test 2017-02-24 21:48:06 +00:00
duncanspumpkin 12ba104485 Add force commands for ratings. 
Note these do not save and will reset if the rating is recalculated
 2017-02-24 20:48:04 +00:00
Michał Janiszewski 84d69b797b Change type of variable used in test 2017-02-24 20:58:01 +01:00
Michał Janiszewski 58da1cde84 Make IniReader not throw while parsing invalid values 2017-02-24 20:26:49 +01:00
Michał Janiszewski 21827c91ab Extend duplicate INI tests with values 2017-02-24 20:18:30 +01:00
Michał Janiszewski 94f0b39f0f Add tests for duplicate sections 2017-02-24 20:15:15 +01:00
Paweł Bylica 7360d06592
Silently fallback to sorfware rendering 
If accelerated rendered cannot be created by SDL, fallback to software rendering. The config option is not changed.
 2017-02-24 20:14:37 +01:00
Michał Janiszewski 0a77374899 Move MemoryStreams in INI tests to stack 2017-02-24 19:53:23 +01:00
OpenRCT2 git bot 9ee910c4db Merge Localisation/master into OpenRCT2/develop. 2017-02-24 04:00:16 +00:00
Paweł Bylica 660373cf38
Fix unmatched memory free 
Before the memory of size 1 was deleted, more allocated.
 2017-02-24 00:15:56 +01:00
Michał Janiszewski d23edb0f91 Fix INI tests for Windows' 2-byte newlines 2017-02-24 00:10:04 +01:00
Michał Janiszewski e5d569ac6c Add INI tests to MSVC 2017-02-23 23:38:25 +01:00
Michał Janiszewski 8143be0707 Add IniReader, IniWriter tests 2017-02-23 23:37:22 +01:00
Michał Janiszewski 1784543e14 Set default first section to true 2017-02-23 23:26:39 +01:00
Michał Janiszewski 9c32cb3a62 Don't break on too short INI streams 2017-02-23 23:26:39 +01:00
duncanspumpkin 7c17cef89c Remove test code 2017-02-23 20:18:34 +00:00
Ted John c2dbd9968f Make openrct2-win the default startup project in VS 
It appears that the second project listed in the solution file is the default startup project. This should make it more convenient for new developers.
[ci skip]
 2017-02-23 18:08:22 +00:00
Duncan 3bb7398649 Add static keyword to static functions 2017-02-23 12:48:41 +00:00
LRFLEW e4b0ef428f Update Xcode Project (#13) 2017-02-23 12:07:42 +00:00
duncanspumpkin 84a0060090 Enforce the bracket and line width rule 2017-02-22 18:18:23 +00:00
Ted John 9ba51f221b Add summary comments 2017-02-22 18:00:19 +00:00
Ted John 40eb2c55fd Reduce duplicated code in IniReader 2017-02-22 17:58:50 +00:00
Ted John d72ced4ea9 Remove final from struct 2017-02-22 17:54:37 +00:00
Ted John 4dc792bc1d Use IStream for IniReader and IniWriter 2017-02-22 17:52:33 +00:00
Ted John 6e9d22e99d Use hpp for header files 
...as they contain C++ implementation code.
 2017-02-22 17:46:10 +00:00
OpenRCT2 git bot 7005d5dca1 Merge Localisation/master into OpenRCT2/develop. 2017-02-22 04:00:19 +00:00
duncanspumpkin c5e9698f0c Fix remaining wall fence issue 2017-02-21 21:17:10 +00:00