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

15020 Commits

Author SHA1 Message Date
Hielke Morsink 88e9a37d78 Add warning to cmakelist 2018-06-05 15:03:20 +02:00
Hielke Morsink 832da93a87 Fix type error in openrct2-dll project 2018-06-05 14:38:14 +02:00
Hielke Morsink 8aa122f54e Use empty initializer lists in the openrct2ui project 2018-06-05 14:37:24 +02:00
OpenRCT2 git bot 5c7d477199 Merge Localisation/master into OpenRCT2/develop. 2018-06-05 04:00:36 +00:00
Hielke Morsink 9c8c2a2820 Missing field initializers part 2 
This commit tackles the more difficult-to-fix warnings that -Wmissing-field-initializers reported. I've compares the new tables in TrackData with the old ones through a script to make sure they are in fact the same.
 2018-06-05 00:18:07 +02:00
Hielke Morsink 5d0022a5cb Remove argument list from zero-initializers with zero/false/nullptr value 2018-06-04 19:50:46 +02:00
Michael Steenbeek a14d59028f
Modify some commands to use CoordsXY 2018-06-04 19:18:52 +02:00
Aaron van Geffen 5b6ae9d9cb Fix appearance of brake/booster speed widgets 2018-06-04 18:51:37 +02:00
Hielke Morsink cb1c55def5 Add extra checks to verify the widget belongs to a toolsize or stepper 
It's possible that widgets are arranged in such a way that the roder of buttons matches the order of tool-size widgets or steppers. Now instead of just checking the types, also their content will be checked.
 2018-06-04 15:49:05 +02:00
Hielke Morsink 32c4dab6c8 Move cut-away stepper logic to mousedown handler 
This makes scrolling work for the stepper widget, and overrides behaviour for scrolling anywhere else in the window.
 2018-06-04 13:41:27 +02:00
Michał Janiszewski 2edec95212
Merge pull request #7625 from janisozaur/headers-check-2 
Verify compilability of headers on Travis v2
 2018-06-04 12:21:54 +02:00
Michał Janiszewski 30e6cf1787 Remove OpenGLAPIProc.h from headers check target 2018-06-04 12:05:54 +02:00
Michał Janiszewski 798a4fe1a7 Add header verification for openrct2-ui 2018-06-04 12:05:54 +02:00
Michał Janiszewski 6307d3532b
Make headers-check an object library 
This will skip linking step
 2018-06-04 07:49:29 +02:00
Hielke Morsink 15c908e4af Remove no longer needed global widget indices 2018-06-04 01:11:00 +02:00
Hielke Morsink a82d6cb195 Allow scrolling up and down on steppers to change their values 2018-06-04 01:10:57 +02:00
Michał Janiszewski 32b419c868
Mark set_format_arg_body as maybe_unused 2018-06-03 23:20:58 +02:00
Michał Janiszewski 949321762b Verify compilability of headers on Travis v2 
Using approach described in
https://github.com/OpenRCT2/OpenRCT2/pull/7369#issuecomment-393973857
with updates to ease readability and maintenance.

Submitted as different PR, to keep history of the old approach.
Supersedes #7369.
 2018-06-03 22:56:34 +02:00
Michał Janiszewski 5126786842
Merge pull request #7624 from janisozaur/test-libzip 
Updates for CMakeLists
 2018-06-03 22:46:33 +02:00
Michał Janiszewski b43a9a6ccf Update SDL2 includes to non-system 2018-06-03 22:32:10 +02:00
Michał Janiszewski 93370ec956 Switch libzip to non-system includes 
This should now work after many changes to upstream
 2018-06-03 22:31:00 +02:00
Michał Janiszewski 7f285a0384
Merge pull request #7620 from janisozaur/remove-unused-func 
Remove unused function
 2018-06-03 20:10:54 +02:00
Michał Janiszewski 995d72f262 Remove function unused with HTTP disabled 2018-06-03 19:56:11 +02:00
Michał Janiszewski 6e72ac350f Remove function unused in no-network builds 2018-06-03 19:56:11 +02:00
Michał Janiszewski 7adc3d41a0 Restore the unused-function warning 2018-06-03 19:56:11 +02:00
Michał Janiszewski f0525d23ae Remove unused function 
Last call was removed in 66a6aa95f6
 2018-06-03 19:56:11 +02:00
Aaron van Geffen 35242f4815 Improve scrolling behaviour in object selection window (#7607) 2018-06-03 14:46:17 +02:00
Ted John 3b8c0703f4
Merge pull request #7609 from IntelOrca/refactor/openssl-usage 
Refactor OpenSSL usage
 2018-06-02 22:22:04 +01:00
Hielke Morsink 7aada25ed2 Clarify disabling of warnings for unused function (#7617) 2018-06-02 22:30:41 +02:00
Michał Janiszewski debb6cd46c Remove declarations of unimplemented functions (#7615) 2018-06-02 13:51:23 +02:00
Aaron van Geffen 9ee1a1f4df
Fix #7613: Improve scrolling behaviour in staff list. (#7614) 2018-06-02 13:06:38 +02:00
Michał Janiszewski 58bde442dd
Fix headers to ensure they carry all their dependencies (#7610) 2018-06-02 09:46:14 +02:00
OpenRCT2 git bot d09fc19361 Merge Localisation/master into OpenRCT2/develop. 2018-06-02 04:00:26 +00:00
Aaron van Geffen 635eab3305
Merge pull request #7579 from AaronVanGeffen/widgets/spinners 
Make widget spinners horizontal
 2018-06-02 00:03:20 +02:00
Ted John f325568a97 Fix non-network builds 2018-06-01 22:47:29 +01:00
Ted John a413d43cda Fix mingw 2018-06-01 22:44:25 +01:00
Aaron van Geffen f2b0f7457e Terminology change: rename spinners to steppers. 2018-06-01 23:25:07 +02:00
Aaron van Geffen 5666ce0025 Update changelog [ci skip] 2018-06-01 23:25:07 +02:00
Aaron van Geffen 0e930287c6 Change spinners for MapGen, Editor{Objective,Scenario}Options. 2018-06-01 23:25:07 +02:00
Michał Janiszewski cb536a15fa Drop static function declarations from header 2018-06-01 22:44:14 +02:00
Aaron van Geffen 53b66fd250 Add Crypt files to Xcode project. 2018-06-01 22:41:42 +02:00
Ted John ae81af7965 Fix Linux 2018-06-01 21:28:27 +01:00
Ted John 9e14b838de Remove linking to bcrypt and ncrypt 2018-06-01 21:27:34 +01:00
Ted John 65f0fbdf78 Add test data for crypt tests 2018-06-01 21:27:34 +01:00
Ted John 72293f2208 Implement new Crypt code and remove CNG for now 2018-06-01 21:27:34 +01:00
Ted John b8d37548ed Implement PEM writing for CNG implementation 2018-06-01 21:27:34 +01:00
Ted John 9467438c1c Implement PEM reading for CNG implementation 2018-06-01 21:27:34 +01:00
Ted John 3b2b15c0f3 Implement CNG implementation bar pem reading 2018-06-01 21:27:34 +01:00
Ted John 9e214258c3 Finish OpenSSL RSA implementation 2018-06-01 21:27:33 +01:00
Ted John fe7e8a17de Start implementing RSA for OpenSSL 2018-06-01 21:27:33 +01:00