mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
11,311 Commits 9 Branches 41 Tags 385 MiB
Commit Graph

11311 Commits

Author SHA1 Message Date
Richard Jenkins 4da7e203ca Improve clarity of scenario difficulty option text 2017-03-28 21:42:18 +02:00
David CARLIER d50a1592fa Prevent double allocations of string allocated config values 
Prevent double allocations of string allocated config values since they can be set by default and then set again by reading the config file.
 2017-03-28 10:32:22 +02:00
Richard Jenkins 5b685d5cad Don't apply peep_make_passing_peeps_sick() to peeps in a queue, fixes #1992 2017-03-28 09:24:42 +02:00
Richard Jenkins d58f761721 Improve algorithm for determining zoom level in track previews, fixes #3502 2017-03-28 09:23:46 +02:00
Michał Janiszewski 1f78afead9 Prevent dereferencing null map element in footpath_remove_real 
No network version increase as the client would simply crash if it were
NULL.
 2017-03-27 22:09:46 +02:00
zaxcav 071c8135ba Update ride_find_closest_mechanic() to search using the station exit location, fixes #5284 2017-03-27 20:00:50 +02:00
Richard Jenkins 2ce4b51528 Do not return money when demolishing a ghost footpath, fixes #5318 2017-03-27 15:04:12 +02:00
Gymnasiast b5b602d5a0 Fix import of SV4 scenario ticks, fixes #5004 2017-03-26 18:13:54 +02:00
Richard Jenkins ccce7b0432 Pass selected colour to the create banner command, fixes #5316 2017-03-26 15:31:21 +02:00
OpenRCT2 git bot 44db9ce80c Merge Localisation/master into OpenRCT2/develop. 2017-03-26 04:00:27 +00:00
Gymnasiast e85c627bd5 Fix importing SV4 walls in pause mode 2017-03-25 21:57:31 +01:00
GrahamRCT 6ea78d6c01 Remove duplicate ride penalty for closed rides 
The game reduces the 'value' of a ride, which decides how much guests will pay for it, when multiple rides of the same type exists within a park. Currently, the rides' status is not taken into account.

This PR ensures a ride with status "closed" will no longer attract the penalty. Only open or broken rides will do so.

In other words, this PR removes ill-deserved punishment for players who:

- Use (partial) rides as scenery
- Build replacement rides while keeping the originals open

Also refactored the code slightly to decrease average-case runtime.
 2017-03-24 08:13:04 +01:00
Michał Janiszewski de6e493049 Catch exceptions using const-reference rather than value 2017-03-23 22:21:17 +01:00
Michał Janiszewski 2df1f87662 Include SDL.h in twitch.cpp for SDL_GetTicks() 2017-03-23 21:06:37 +01:00
Ted John f9f516c372 Format Fountain as C++ 2017-03-23 18:36:20 +00:00
Ted John 7fb653d1a7 Remove platform include from game.h 2017-03-23 18:34:32 +00:00
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
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