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

11142 Commits

Author SHA1 Message Date
Ted John 9e4efb67b1 Move fountain files to C++ 2017-03-23 17:58:01 +00:00
Ted John a5744dcaee Merge pull request #5301 from IntelOrca/refactor/duck 
Refactor duck
 2017-03-23 17:54:55 +00:00
Ted John 481f5d706f Fix compilation and refactor GetFrameImage 2017-03-23 17:37:25 +00:00
Ted John cd54503bdb Refactor duck to member functions 2017-03-23 17:37:25 +00:00
Ted John 3f53f8cb5d Refactor duck to C++ 2017-03-23 17:37:25 +00:00
OpenRCT2 git bot 78ff61ce31 Merge Localisation/master into OpenRCT2/develop. 2017-03-23 04:00:20 +00:00
Michał Janiszewski a59886e6b0 Merge pull request #5315 from janisozaur/minor-fixes 
Minor fixes
 2017-03-18 23:34:28 +01:00
Michał Janiszewski 92d3e219d2 Add parentheses to enforce order of evaluation in input.c 2017-03-18 23:23:23 +01:00
Michał Janiszewski fa65fd1481 Reduce scope of variables in input.c, rect.c 2017-03-18 23:23:23 +01:00
Michał Janiszewski 0471d4ccf6 Guard access to ride_type field in ride.c 2017-03-18 23:23:23 +01:00
Michał Janiszewski 4a51ebdf1f Remove unused variable 2017-03-18 23:23:23 +01:00
Michał Janiszewski 4df0a5ee7d Reduce scope of variable in Imaging.cpp 2017-03-18 23:23:23 +01:00
Michał Janiszewski ddc2a708d4 Don't test unsigned value for being negative 2017-03-18 23:23:23 +01:00
Ted John 57dc2af732 Update VS prerequisites and force Windows 10 SDK 2017-03-18 02:05:21 +00:00
OpenRCT2 git bot 468f369907 Merge Localisation/master into OpenRCT2/develop. 2017-03-17 04:00:28 +00:00
Duncan 1c526ddb98 Merge pull request #5291 from duncanspumpkin/refactor_banner 
Refactor Banner Map Element Functions
 2017-03-16 22:20:31 +00:00
OpenRCT2 git bot 18767850bd Merge Localisation/master into OpenRCT2/develop. 2017-03-16 04:00:18 +00:00
Nelson Chen dc848bb8e3 macOS Sierra (10.12): Disallow Automatic Window Tabbing 
Automatic Window Tabbing in macOS Sierra causes a menu item called "Show
Tab Bar" to appear under the Window menu in the menu bar. Selecting this
option causes a double-title bar effect as there is no option in OpenRCT2
to make new tabbed "documents". This double-title bar can be untoggled
by selecting "Hide Tab Bar".

I don't think OpenRCT2 is going to become a tabbed document-oriented
themepark simulator anytime soon. Thanks, but no thanks Sierra.

References:
* https://codereview.chromium.org/2325313002/
* https://hg.mozilla.org/releases/mozilla-aurora/rev/385b9ea08ff7

* Use better Obj-C styling for macos_disallow_automatic_window_tabbing()
 2017-03-13 23:03:29 +01:00
Michael Steenbeek 2bafea9551 Merge pull request #5303 from Broxzier/use-widget-defines 
Replace hardcoded values in window files
 2017-03-13 23:01:47 +01:00
duncanspumpkin 132721128e Create function for map_can_build_at 2017-03-13 21:47:43 +00:00
duncanspumpkin 6878341214 Make review changes 2017-03-13 17:41:27 +00:00
duncanspumpkin 5dbc82ab99 Apply cpp coding style 
Fix warning

Fix xcode

Use math min, use correct caseing for non windows

Fix more warnings

Fix warning
 2017-03-13 17:41:27 +00:00
duncanspumpkin afafdba0b7 Refactor of game commands 2017-03-13 17:41:25 +00:00
duncanspumpkin 9087170cf1 Move functions into banner.cpp 2017-03-13 17:41:24 +00:00
Duncan 809abe4fe0 Merge pull request #5270 from duncanspumpkin/refactor_entrance 
Refactor of Entrance Map Element
 2017-03-13 17:36:52 +00:00
LRFLEW d24961640a Update Xcode Project 
Fix warning

Fix warning
 2017-03-13 17:33:51 +00:00
duncanspumpkin 60fb821675 More refactoring 2017-03-13 17:33:50 +00:00
duncanspumpkin b2bab06235 Apply cpp style 2017-03-13 17:33:49 +00:00
duncanspumpkin 652cf510e5 Continue refactor. Fix bug with provisional tracks. 
Note this might bring back #4728.
 2017-03-13 17:33:48 +00:00
duncanspumpkin 9725e6b647 Apply the cpp style guide 2017-03-13 17:33:47 +00:00
duncanspumpkin ffeb1fa527 Initial refactor of entrance 2017-03-13 17:33:46 +00:00
Ted John 934db3705b Fix thunder initialisation 2017-03-12 12:29:20 +00:00
Ted John 90ec681019 Merge pull request #5300 from IntelOrca/refactor/climate 
Refactor climate
 2017-03-12 12:04:05 +00:00
OpenRCT2 git bot 6880490c66 Merge Localisation/master into OpenRCT2/develop. 2017-03-12 04:00:17 +00:00
Ted John bcc0bfa485 Rename climate.h to Climate.h 2017-03-11 22:59:33 +00:00
Ted John 04a3c73c59 Refactor climate.h structs 2017-03-11 22:59:32 +00:00
Ted John 0d722d55e1 Refactor climate to C++ 2017-03-11 22:59:32 +00:00
Broxzier 06c195dd3c Fix error in setting pressed tab 2017-03-11 23:49:39 +01:00
Broxzier c0962a56a8 Use widget index in new ride window 2017-03-11 23:49:38 +01:00
Broxzier f688a2c9db Add and use widget index for exit and option button 2017-03-11 23:49:37 +01:00
Broxzier 4cd39babbb Replace hardcoded value in various windows 2017-03-11 23:49:32 +01:00
Broxzier f9e2a74c4d Replace hardcode value and better readibility in ride.c 2017-03-11 23:42:33 +01:00
wolfreak99 56a1dbb54c Replace magic values for enabled widgets in Ride window (#5278) 2017-03-11 22:29:39 +01:00
Michał Janiszewski 2f66ac2c11 Fix errorneous access to sound params in vehicle_update_sound_params 2017-03-11 22:14:38 +01:00
wolfreak99 2fe134fd5f Make shortcut keys window bigger and resizable 2017-03-11 22:09:24 +01:00
Ted John c0ce8ef3c1 Merge pull request #5298 from IntelOrca/refactor/balloon 
Refactor balloon to C++
 2017-03-11 13:14:18 +00:00
Ted John 7d33dda13b Fix xcode project 2017-03-11 12:57:46 +00:00
Ted John e4c960b7d9 Separate out game_command_balloon_press 2017-03-11 12:57:46 +00:00
Ted John 2d063ef545 Add comment to balloon press logic 2017-03-11 12:57:45 +00:00
Ted John 8148c86f6b Use balloon for create_balloon 2017-03-11 12:57:45 +00:00