Commit Graph

13861 Commits

Author SHA1 Message Date
Michał Janiszewski 19d35e6898 MSVC fixes pt 5 2018-01-11 09:30:09 +01:00
Michał Janiszewski f50ce343a2 MSVC fixes pt 4 2018-01-11 09:30:09 +01:00
Michał Janiszewski 96744fdaad MSVC fixes pt 3 2018-01-11 09:30:09 +01:00
Michał Janiszewski 6cdf3db245 MSVC fixes pt 2 2018-01-11 09:30:09 +01:00
Michael Steenbeek 241d583811 Fix Xcode project 2018-01-11 09:30:09 +01:00
Michał Janiszewski 5e72d7423a Update testpaint 2018-01-11 09:30:09 +01:00
Michał Janiszewski eba2119a81 Update testpaint 2018-01-11 09:30:09 +01:00
Michał Janiszewski 469e142c7b Change casing of header files 2018-01-11 09:30:09 +01:00
Michał Janiszewski 156ecb7277 MSVC fixes pt 1 2018-01-11 09:30:09 +01:00
Michał Janiszewski f1fa9f7106 Format TrackPaint.cpp 2018-01-11 09:30:09 +01:00
Michał Janiszewski a9767c801e Clang-format guards 2018-01-11 09:30:09 +01:00
Michał Janiszewski 70505f4fa0 Refactor track_paint to C++ 2018-01-11 09:30:09 +01:00
Michał Janiszewski 82dfde4419 Refactor ride_data to C++ 2018-01-11 09:30:09 +01:00
Michał Janiszewski 5a8cfb16c8 Clang-format guards for static data
This guards most of the hardcoded data from clang-format.

[ci skip]
2018-01-11 09:19:56 +01:00
OpenRCT2 git bot fbb8185284 Merge Localisation/master into OpenRCT2/develop. 2018-01-11 04:00:32 +00:00
Michał Janiszewski 6a65f791b6 Add const to arguments 2018-01-10 23:58:57 +01:00
Gymnasiast ce9a72a4e9 Fix export of invented scenery items 2018-01-10 23:24:10 +01:00
Gymnasiast 9f8e3240d3 Fix #6992: Crash when hovering over an RCT1 track design in Track Manager 2018-01-10 21:20:46 +01:00
Gymnasiast 8fb0046136 Fix #6990: Scenery not correctly marked as available 2018-01-10 20:29:20 +01:00
Michael Steenbeek ddd8479827 Move some research logic out of the Inventions window 2018-01-10 16:31:13 +01:00
Michael Steenbeek 37cec95ce2 Move research list import/export to separate functions 2018-01-10 16:31:13 +01:00
Michael Steenbeek 4db3323973 Create scenery_group_set_invented() 2018-01-10 16:31:13 +01:00
Michael Steenbeek 0995ab9910 Fold gResearchNextCategory into gResearchNextItem 2018-01-10 15:31:47 +01:00
Michael Steenbeek b11f59ba6c Refactor gResearchedSceneryItems 2018-01-10 15:31:47 +01:00
Michael Steenbeek d2de1a4a95 Abstract access to gResearchedRide{Types,Entries} 2018-01-10 15:31:47 +01:00
Michael Steenbeek ea4eb7775a Create scenery_set_(not_)invented() 2018-01-10 12:28:36 +01:00
Michael Steenbeek 3d9466a2f6 Fix refactor mistake 2018-01-10 12:05:06 +01:00
Michael Steenbeek 9cad16b7f4 Fix Xcode project 2018-01-09 23:54:03 +01:00
Michał Janiszewski c098eaa25d MSVC fix 2018-01-09 23:52:22 +01:00
Michał Janiszewski 517b27c1a4 Format refactored files 2018-01-09 23:52:22 +01:00
Michał Janiszewski 384df8f52c Clang-format guards 2018-01-09 23:52:22 +01:00
Michał Janiszewski 09fbce741d Refactor vehicle_paint to C++ 2018-01-09 23:52:22 +01:00
Michał Janiszewski 5c494c5894 Refactor vehicle_data to C++ 2018-01-09 23:52:22 +01:00
Michael Steenbeek a116bb530f Remove unused ORI_RIDE_FLAG_SEPARATE 2018-01-09 21:35:10 +01:00
Michael Steenbeek 55b473d866 Rename gResearchLastItemSubject to gResearchLastItem 2018-01-09 21:35:10 +01:00
Michael Steenbeek 0ae5d7d476 Remove research_remove_non_separate_vehicle_types()
This removes more usages of the SEPARATE_RIDE flag.
2018-01-09 21:35:10 +01:00
Michael Steenbeek e15c8f8b3b Import broken vehicle and car from S4 2018-01-09 14:06:11 +01:00
Michael Steenbeek f508402317 Fix RCT1 research naming to match RCT2's 2018-01-09 13:51:54 +01:00
Michael Steenbeek 6a88d6e04d Move and rename RCT{1,2,12}.h 2018-01-09 13:36:41 +01:00
Michael Steenbeek 0296608623 Name/fix various RCT1/RCT2 limits 2018-01-09 13:36:41 +01:00
Michał Janiszewski 9c84ae30fb Hide colliding "struct VDStruct" definitions to anon namespaces 2018-01-09 11:01:03 +00:00
Michael Steenbeek 6088a084a2 Replace 0x40 with COLOUR_FLAG_INSET 2018-01-09 10:37:09 +01:00
Michael Steenbeek 857e64590d Name some rct(1)_peep fields 2018-01-09 10:35:07 +01:00
Michael Steenbeek 647f085098
Merge pull request #6925 from AaronVanGeffen/widgets/cleanup-1
Clean up and name remaining widgets
2018-01-09 09:52:15 +01:00
OpenRCT2 git bot 0ad6da7359 Merge Localisation/master into OpenRCT2/develop. 2018-01-09 04:00:58 +00:00
Michał Janiszewski e602162fdb Include openrct2-cli in default `all` target 2018-01-08 13:15:11 +01:00
Michał Janiszewski 6b06ada801 Fix Android compilation 2018-01-08 10:03:31 +01:00
OpenRCT2 git bot f65345a0fb Merge Localisation/master into OpenRCT2/develop. 2018-01-08 04:00:31 +00:00
Aaron van Geffen c9b48beea0 Replace WWT_CLOSEBOX with WWT_BUTTON where not used as a close button. 2018-01-08 00:02:25 +01:00
Aaron van Geffen aa885c661e Always apply vertical alignment to button texts.
This has no effect on the appearance as of this commit, yet.
2018-01-08 00:01:45 +01:00