mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity
13,573 Commits 8 Branches 59 Tags
ff7eb93f5ff8d7babc0718ce67d122a9f4ef3f51
Commit Graph

13573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OpenRCT2 git bot
ff7eb93f5f Merge Localisation/master into OpenRCT2/develop. 2018-01-06 04:00:29 +00:00
Michał Janiszewski
94946ce13b Use min/max instead of clamp for limiting tree count in RMG 
Call to `clamp` may not guarantee correct result when `high` < `low`,
use calls to `max()` and `min()` explicitly instead.
 2018-01-05 23:44:59 +00:00
Ted John
0398c5d11e Merge pull request #6950 from IntelOrca/refactor/more-drawing-stuff-to-cpp 
Refactor more drawing stuff to C++
 2018-01-05 22:51:01 +00:00
Michael Steenbeek
3882715c38 Fix Xcode project 2018-01-05 23:04:52 +01:00
Ted John
3dcbebcf68 Refactor drawing.c to C++ 2018-01-05 22:57:57 +01:00
Ted John
144dbf431c Refactor ttf.c to C++ 2018-01-05 22:57:55 +01:00
Ted John
0c3c998177 Refactor lightfx.c to C++ 2018-01-05 22:57:55 +01:00
Ted John
559ec8a404 Refactor font.c to C++ 2018-01-05 22:57:54 +01:00
Michael Steenbeek
c2fe90c573 Fix Xcode project 2018-01-05 22:47:35 +01:00
Ted John
36d4e7753f Refactor scrolling_text.c to C++ 2018-01-05 19:58:15 +00:00
Ted John
cb468cadb6 Refactor string.c to C++ 2018-01-05 19:58:15 +00:00
Ted John
90b63b09f8 Refactor rect.c to C++ 2018-01-05 19:58:15 +00:00
Ted John
ad406e5ae0 Refactor line.c to C++ 2018-01-05 19:58:15 +00:00
Ted John
15d0a726ac Merge pull request #6913 from IntelOrca/refactor/remove-exception 
Remove custom Exception base exception
 2018-01-05 19:50:56 +00:00
Michael Steenbeek
6450cce829 Fix compilation on Xcode 2018-01-05 19:58:05 +01:00
Ted John
02c58a6c5a Remove custom base Exception class 2018-01-05 18:11:47 +00:00
Michael Steenbeek
61dfb3dac7 Update vehicle descriptions 
These are only displayed in the Vehicle tab, so they have to apply to the vehicle itself.
 2018-01-05 11:14:38 +01:00
Harrison Gentry
5862cd9d40 Fix guest counter to say '1 guest' instead of '1 guests' 2018-01-05 08:58:17 +01:00
Tyler Ruckinger
26c35b5c28 Fix consecutive thoughts removal on ride demolish (#6937) 
* Fix consecutive thoughts removal on ride demolish

* Update contributors.md

* Update changelog

* Update network version
 2018-01-05 06:49:05 +00:00
Aaron van Geffen
81905fc161 Vertically align widgets in lower-left bottom toolbar. 2018-01-05 00:44:59 +01:00
Duncan
12dde3a589 Refactor of Vehicle Sound Functions (#6907) 
* Refactor vehicle_update_sound_params

Named known params.
Changed function structure to use more return statements to prevent multiple nested ifs.
Used core memory functions instead of hand rolled version.
Added more comments.
Named sub_6BC2F3.
Added comment on likely source of corruption of sound.

* Refactor vehicle_sounds_update

Split the function up into multiple functions.
Rework code to remove GoTos.

* Label params. Refactor slightly the restraint code to use bools
 2018-01-04 21:38:27 +00:00
Hielke Morsink
512dc2c721 Fix #6923: hovering over queues turns them into regular paths 2018-01-04 21:23:56 +01:00
Michael Steenbeek
31bf792538 Refactor research - spike 1 
This involves refactoring gResearchedRideTypes and gResearchedRideEntries
and the functions involved.

Also renames some functions in order to better express what they do.
 2018-01-04 17:44:51 +01:00
Michał Janiszewski
c7417e11a4 Use bool type for boolean logic 2018-01-04 15:40:52 +01:00
Hielke Morsink
3dd98c7aa2 Apply coding style 2018-01-04 07:58:31 +01:00
Hielke Morsink
a6e4c1d677 Remove undefined function declaration 2018-01-04 07:58:31 +01:00
Hielke Morsink
7d37798f19 Reduce duplicated code in finances window 
All of the pages share some common widgets (title, close button, background, tabs). To
reduce code duplication here, I've moved those values to a define that then gets used
for each of the pages.
The same thing applies to enabled widgets. One additional change is that left bitshifts
from `1` have been changed to `1ULL`.
 2018-01-04 07:58:31 +01:00
Aaron van Geffen
0138df5dd8 Centre overall viewports on geometric centre. 2018-01-04 07:57:27 +01:00
Aaron van Geffen
92bcc5f579 For overall views, show small rides zoomed in all the way. 2018-01-04 07:57:27 +01:00
Michał Janiszewski
17354122d4 Remove deprecated comment 2018-01-04 07:36:54 +01:00
Michał Janiszewski
33a94fe1bb Use C++ headers in C++ code 2018-01-04 07:36:54 +01:00
Michał Janiszewski
b2bc974fe7 Use nullptr where possible 2018-01-04 06:58:44 +01:00
OpenRCT2 git bot
56ab7e9c09 Merge Localisation/master into OpenRCT2/develop. 2018-01-04 04:00:39 +00:00
Michał Janiszewski
4d0c88fb94 Mark constructors explicit (#6928) 2018-01-04 01:12:34 +00:00
Tobias Kohlbau
7aeb3e11b3 Fix #5562: fix continous reopening of log files 
Every logging opens a new file handle which should be avoided
for performance reasons.

Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
 2018-01-04 00:01:43 +01:00
Michael Steenbeek
91589f57c6 Compile map.c as C++ 2018-01-03 20:40:51 +01:00
Richard Jenkins
3ab3003e7b Xcode fix 2018-01-03 15:07:17 +01:00
Ted John
0cbc8bea10 Fix compile of Scenario.cpp 2018-01-03 15:07:17 +01:00
Ted John
49f5611bd1 Rename scenario.c|h to cpp 2018-01-03 15:07:17 +01:00
Hielke Morsink
eb4a8924d1 Refactor and clean up footpath-related code 
This commit corrects some misused defines, and gave them clearer names.
For example, the slope mask was only useful for surface elements, so now
"SURFACE" is in its name. I also replaced any hard coded values that I
could find and knew their purpose off.
 2018-01-03 10:57:37 +01:00
Michael Steenbeek
d25856d59c Make tile element type strings in the Tile Inspector translatable 2018-01-03 10:21:53 +01:00
Michael Steenbeek
347ff702d0 Refactor objects 2018-01-03 10:16:51 +01:00
Aaron van Geffen
da519c9b32 Add extra padding to label text in guest window. 2018-01-03 10:09:21 +01:00
OpenRCT2 git bot
ef657caed3 Merge Localisation/master into OpenRCT2/develop. 2018-01-03 04:01:00 +00:00
Michael Steenbeek
3b06f92c0a Merge pull request #5964 from janisozaur/sse4.1 2018-01-02 22:27:17 +01:00
Michał Janiszewski
7f5e3a3a64 Sink some variables 2018-01-02 22:03:10 +01:00
Michał Janiszewski
68881fbbc7 Call core_init() on paths that need it 2018-01-02 19:53:51 +01:00
Michael Steenbeek
1bc711e266 Fix #5761: Mini coaster doesn't appear despite being selected (#6909) 2018-01-02 19:40:08 +01:00
Ted John
d14dce2b95 Prevent invalid chunk message when loading SC4 
Exception messages were being logged when classifying the file type. This is generally unwanted as it will happen in normal cicumstances.
 2018-01-02 18:23:14 +00:00
Michael Steenbeek
b38123924a Fix object override size (#6901) 2018-01-02 17:51:29 +00:00