mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-08-29 21:46:05 +02:00
Code Issues Projects Releases Wiki Activity
11183 commits 9 branches 41 tags 334 MiB
Commit graph

11183 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ted John
991a0c5f23 Update changelog 
[ci skip]
 2017-03-13 19:31:32 +00:00
Ted John
6429ccd9df Implement scenery eye dropper 2017-03-13 19:27:20 +00:00
Ted John
6e7c5b7031 Add scenery eyedropper button 2017-03-13 18:05:13 +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
Ted John
dfc140158e Use member functions for balloon 2017-03-11 12:57:45 +00:00
Michał Janiszewski
00b6fb53c6 Fix #5299: Scenario editor crash when placing peep spawn 2017-03-10 23:02:04 +01:00
Ted John
ce13b551cb Refactor balloon to C++ 2017-03-10 17:26:08 +00:00
Ted John
20a43227e0 Rename balloon.c to balloon.cpp 2017-03-10 17:12:29 +00:00
Duncan
0ea93c5509 Merge pull request #5293 from DEVoytas/patch-1 
Update readme.md: fix 'gitflow workflow' link
 2017-03-10 12:15:29 +00:00
Mariusz
0ff968fb7b Update readme.md: fix 'gitflow workflow' link 
Current:
https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
lands on:
https://www.atlassian.com/git/tutorials/comparing-workflows
Replace it with:
https://www.atlassian.com/git/tutorials/comparing-workflows#gitflow-workflow
to point to specific workflow.
 2017-03-10 13:08:59 +01:00
Ted John
812a37d5fb Merge pull request #4790 from IntelOrca/add/uri-protocol-handler 
Add uri protocol handler
 2017-03-10 10:46:28 +00:00
Marijn van der Werf
3bf14e0514 Update Xcode project 2017-03-09 14:57:14 +01:00
Ted John
cdffd6116d Fix non-network builds 2017-03-08 20:45:49 +00:00