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

14763 Commits

Author SHA1 Message Date
Umdlye 86b9546005 Use default colour for currency in demolish/refurbish prompts [ci skip] 2018-05-24 21:32:45 +02:00
Aaron van Geffen c89ebb0510
Merge pull request #7516 from Gymnasiast/string-to-money-imrpov 
Return MONEY32_UNDEFINED on unsalvagable string_to_money() input
 2018-05-24 17:52:37 +02:00
Aaron van Geffen 85575b612e Apply formatting to string_to_money. 2018-05-24 17:17:44 +02:00
Aaron van Geffen 1d7d8a8043 Do not reallocate to prefix decimal money with '0'. 2018-05-24 17:17:44 +02:00
Aaron van Geffen 847d4e8b03 Process string_to_money's worst case in O(n) rather than O(n²). 2018-05-24 15:03:15 +02:00
Michael Steenbeek b9186ce83d Make argument const 2018-05-24 13:44:09 +02:00
Aaron van Geffen 48359cc02d Clean up the contributors file [ci skip] 
* Project team -> Development team
* Clarify contributions for RCT2 implemenation.
* Clarify contributions in additional implementation section.
* List contributors under their most appropriate sections.
 2018-05-24 13:41:08 +02:00
Gymnasiast ef7b8b8da0 Return MONEY32_UNDEFINED on unsalvagable string_to_money() input 2018-05-24 13:22:25 +02:00
Michael Steenbeek f7a053b5eb
Update changelog for #6938 [ci skip] 2018-05-24 10:48:49 +02:00
Aaron van Geffen b763a32b44
Merge pull request #3473 from jensj12/RenewRidesButton 
Added button to renew ride
 2018-05-24 00:09:12 +02:00
Aaron van Geffen 0d248dd6f4 Bump network version. 2018-05-23 16:34:01 +02:00
Aaron van Geffen ca16fe8e62 Fix refurbishment confirmation window not closing in multiplayer mode. 2018-05-23 16:33:37 +02:00
jensj12 3f0308a517 Fix Travis builds 2018-05-23 16:33:37 +02:00
jensj12 b6b3486a3d Fix cost being shown as 0 while paused 2018-05-23 16:33:37 +02:00
jensj12 56fcd2ec94 Use ride_get_start_of_track in TrackDesignSave 2018-05-23 16:33:37 +02:00
jensj12 ce0bf28cb5 Fix not enough cash error showing incorrectly 2018-05-23 16:33:37 +02:00
jensj12 50e3f8b4f6 Cleanup of ride_demolish 2018-05-23 16:33:37 +02:00
jensj12 d43d6b94bb Add changelog entry 2018-05-23 16:33:37 +02:00
jensj12 23dc6bb9d3 Add button to refurbish ride 
Add a button to refurbish the selected ride. The cost for this is 35% of the
build price and may only be done if the ride is closed and empty.
 2018-05-23 16:33:37 +02:00
Aaron van Geffen 77b09b3daf
Merge pull request #7385 from Fusxfaranto/develop 
Use ICU for UTF-8 conversion and add support for unicode uppercasing
 2018-05-23 10:08:27 +02:00
OpenRCT2 git bot 6e6dc3e7ff Merge Localisation/master into OpenRCT2/develop. 2018-05-23 04:00:34 +00:00
Aaron van Geffen 1363f35aae Update Xcode project dependencies to v17. 
* Update SDL2 to version 2.0.8.
* Introduce dependency on ICU, bundling version 61.1.
* Introduce FreeType2 dependency now that we have adopted SDL2_ttf in our own sources.
* Drop dependency on external SDL2_ttf.
 2018-05-22 19:51:34 +02:00
Aaron van Geffen b836ad050d Rewrite CodePageFromUTF8 as CodePageFromUnicode. 2018-05-22 19:51:34 +02:00
Aaron van Geffen 3fd75906b6 Fix String::ToUtf8 and String::ToUtf16 on Linux. 
wchar_t typically uses UTF-32 codepoints on Linux, unlike Windows, which uses UTF-16.
 2018-05-22 19:51:34 +02:00
Aaron van Geffen 6f9226aee3 Fix testpaint. 2018-05-22 17:37:07 +02:00
Michał Janiszewski 5360921dfd Add explicit -m32 CXXFLAGS for 32-bit job on Travis 
This fixes cmake's find_package() for cross-compilation
 2018-05-22 17:37:07 +02:00
Aaron van Geffen bab66d1eaf Fix MinGW compilation. 2018-05-22 17:37:07 +02:00
Aaron van Geffen 7e7e0427b3 Update compilation instructions. 2018-05-22 17:37:07 +02:00
Ted John 71a2cb46d2 Fix ToUpper tests on Windows 
LCMapStringEx does not unfold ligatures if there is no uppercase equivalent.
 2018-05-22 17:37:07 +02:00
Aaron van Geffen bf1fd997d0 Do not require ICU on MinGW and MSVC targets. 2018-05-22 17:37:07 +02:00
Aaron van Geffen 4c67c0eaca Split ToUpper tests into more granular subtests. 2018-05-22 17:37:07 +02:00
Aaron van Geffen 13e35285f1 Replace non-Windows versions of ToUtf8 and ToUtf16 with ICU calls. 2018-05-22 17:37:07 +02:00
Ted John 6109a9bf17 Improve Windows implementation of ToUpper 2018-05-22 17:37:07 +02:00
Ted John 085d85585a Use Windows API for utf8-utf16 conversions 2018-05-22 17:37:07 +02:00
Aaron van Geffen 8e919d2f84 Change ICU variant of String::ToUpper for string_view argument. 2018-05-22 17:37:07 +02:00
Ted John 386ab1b0fa Add windows implementation for ToUpper 2018-05-22 17:37:07 +02:00
Aaron van Geffen 392459f038 Remove dependency on iconv. 2018-05-22 17:37:07 +02:00
Fusxfaranto a91dd6a356 Implement ICU support for uppercasing, with tests. 2018-05-22 17:37:07 +02:00
Aaron van Geffen f29b42cc26 Allow converting strings between code pages in both directions. 
Co-authored-by: Fusxfaranto <fusxfaranto@gmail.com>
 2018-05-22 17:37:07 +02:00
Aaron van Geffen ea80f0ea56 Split off GetIcuCodePage to its own function. 2018-05-22 17:37:07 +02:00
Aaron van Geffen ee8bf9bd4a Use ICU for converting strings to UTF-8 instead of our own tables. 
Co-authored-by: Fusxfaranto <fusxfaranto@gmail.com>
 2018-05-22 17:37:07 +02:00
Aaron van Geffen 764c3d01b6 Fix the Xcode project's openrct2-cli target. 2018-05-22 17:36:17 +02:00
Aaron van Geffen 3ed6a25bbb
Fix park value regression from #7543. 2018-05-22 11:42:21 +02:00
Michael Steenbeek d44d727fac
Merge pull request #7543 from AaronVanGeffen/refactor/park 
Create new Park class
 2018-05-21 10:17:38 +02:00
Ted John 080330070b Write file index even if there are no files 2018-05-20 18:40:06 +01:00
Ted John efc14fe8b6 Do not create title sequences directory unnecessarily 2018-05-20 18:39:52 +01:00
Ted John 46300f216f Fix #7544: Freeze when starting headless server with no arguments 
Fixes #7313: Loading an invalid path with openrct2 produces results different than expected

Do not load title sequences in headless mode and prevent use of null audio mixer when ride music is stopped.
 2018-05-20 02:21:44 +01:00
Aaron van Geffen bfa5bf6ecc Refactor procedural park methods into Park calls. 2018-05-19 20:21:18 +02:00
Hielke Morsink 72b66c6c9d
Merge pull request #7483 from oli414/new-new-offroad-staff 
Fix #7418: Staff walk off paths with a connection but no adjacent path
 2018-05-19 19:55:24 +02:00
Aaron van Geffen c211ac5a7b Replace singleton Park with relevant Context call. 2018-05-19 19:51:47 +02:00