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

10639 Commits

Author SHA1 Message Date
Ted John 8b46b32031 Protect score structs from C 2017-01-17 17:07:29 +00:00
Ted John 71f83cd7a7 Dissociate rct_news_item from RCT2 2017-01-17 12:51:02 +00:00
Ted John 8fb55a1f06 Move scores.dat structs to rct2.h 2017-01-17 12:21:57 +00:00
Ted John 6daf6c567a Convert tabs to spaces for rct2.h 2017-01-17 12:08:54 +00:00
Michael Steenbeek 6016339773 Fix two usages of raw RIDE4 flag usages, rename one, add comment 
#5065
 2017-01-17 12:00:47 +00:00
Ted John abad7dd8ef Merge pull request #5076 from IntelOrca/refactor/structs/award 
Create new OpenRCT2 award struct
 2017-01-16 22:48:48 +00:00
Ted John f6dee8c58d Unify rct1_award and rct2_award 2017-01-16 18:41:16 +00:00
Ted John 5efd23dbe5 Create new OpenRCT2 award struct 2017-01-16 18:00:04 +00:00
Ted John aca7b12fbe msbuild: Fix building g2 with spacy paths 2017-01-16 17:39:55 +00:00
Marijn van der Werf 24f9a0c0ef Fix #5081: Crash on fetching server list 2017-01-16 14:29:49 +00:00
Michał Janiszewski b230909097 Merge #5043, #5068, #5080 and update network version to 29 
Merges

OpenRCT2/OpenRCT2#5080
OpenRCT2/OpenRCT2#5043
OpenRCT2/OpenRCT2#5068
 2017-01-16 14:43:15 +01:00
Ted John 0da434bb8a Fix tall ride consideration 
The consideration of tall rides was probably not working properly as it was doing a straight comparrison of a flags variable.
This instead removes it as it already checks if the ride has ratings anyway. I've also added a status check so that guests do not attempt to walk to a ride far away that isn't open.
 2017-01-16 14:30:54 +01:00
wolfreak99 3e621d75f6 Check finance_payment for int overflows 2017-01-16 14:29:03 +01:00
Broxzier 2235390ce2 Fix 5079 don't remove walls when building stalls and footpaths 2017-01-16 14:28:16 +01:00
Michał Janiszewski 77a0c141a7 Merge pull request #5044 from janisozaur/ninja 
Add BUILD_BYPRODUCTS entries to CMakeLists for googletest
 2017-01-16 09:38:58 +01:00
OpenRCT2 git bot cadb451806 Merge Localisation/master into OpenRCT2/develop. 2017-01-16 04:00:17 +00:00
Ted John 7edf1e8b7f Merge pull request #4936 from Broxzier/short 
Because of a comment on a diff in #4878 asking for clearer and more consistent type usage. What this PR changes:

No unsigned long long found
(signed) long long -> sint64
unsigned int -> uint32
(signed) int -> sint32
(signed) long -> sint32
unsigned short -> uint16
(signed) short -> sint16
unsigned char -> uint8
No signed chars found
plain char is implementation-defined, so I left those in.
 2017-01-14 23:41:47 +00:00
Ted John 0d51bdde3f Fix broken code alignment 2017-01-14 23:40:46 +00:00
Hielke Morsink 307745dd86 clang-format: better pattern for common.h 
[ci skip]
 2017-01-14 18:48:11 +00:00
Hielke Morsink a36b200dda Add include categories to .clang-format 
This adds 3 rules that clang-format uses when ordering include files:
 - common.h is assigned priority -1
 - Incudes using <> is given priority 1
 - Includes using "" is given priority 2

It also disables putting the "main" file first (the .h/.hpp with the
same name as the .c/.cpp"

#5074
[ci skip]
 2017-01-14 18:30:48 +00:00
Ted John c418836a87 Merge pull request #5073 from IntelOrca/refactor/name-ride-entry-flags 
Refactor/name ride entry flags
 2017-01-14 18:29:34 +00:00
Ted John fe389be7c9 Remove unused ride entry flags 2017-01-14 17:37:15 +00:00
Ted John 8f57e514fe Name more ride entry flags 2017-01-14 17:36:47 +00:00
Ted John 769d86e7cc Refactor vehicle_update_boat_location 2017-01-14 17:36:32 +00:00
Ted John f4cea0e6c8 Name a couple of ride entry flags and format enum 2017-01-14 16:48:56 +00:00
Broxzier b80b71cf81 Fixed typos and warnings after rebase 2017-01-14 14:31:06 +01:00
Broxzier 2bf1b4cd2f Fox linux builds (hopefully) 2017-01-14 12:37:34 +01:00
Broxzier a26eac91ef Use typedef for diagnostic levels, small refactor 2017-01-14 12:37:33 +01:00
Broxzier d857ebb2ad Move type definitions before the first include 
This way the last remaining uses of int could be replaced with sint32 as
well. Before this change there was a circular dependancy which made the
types unknown in diagnostic.h.
 2017-01-14 12:37:32 +01:00
Broxzier 60603ae10a Use types from common.h 2017-01-14 12:37:31 +01:00
Aaron van Geffen 3d7cfa2772 Minor: Homebrew package update for SpeexDSP 
[ci skip]
 2017-01-14 07:25:37 +01:00
Michał Janiszewski d88635307f Merge pull request #5062 from janisozaur/cmake-warnings 
More warnings for CMake
 2017-01-13 19:46:30 +01:00
Ted John baed215984 Add helper: ride_has_ratings 
#5066
 2017-01-13 18:14:38 +00:00
Ted John f10bd42dcd Merge pull request #5067 from IntelOrca/refactor/flag-naming 
Name ride type flags
 2017-01-13 17:16:52 +00:00
Ted John aed5c0aa60 Name flag: RIDE_TYPE_FLAG_26 2017-01-13 13:20:16 +00:00
Ted John ae7048b2a7 Name flag: RIDE_TYPE_FLAG_30 2017-01-13 13:16:51 +00:00
Ted John 053f8a70bf Name flag: RIDE_TYPE_FLAG_18 2017-01-13 13:13:24 +00:00
Ted John cf0c489d40 Name flag: RIDE_TYPE_FLAG_13 2017-01-13 13:08:56 +00:00
Ted John bdc5078003 Name flag: RIDE_TYPE_FLAG_6 2017-01-13 13:04:11 +00:00
Ted John ef2ddbf462 Name flag: RIDE_TYPE_FLAG_20 2017-01-13 12:55:47 +00:00
Michał Janiszewski f4eb156c7a Only enable some of compiler warnings when they are supported 
ICC does not support all of the new flags
 2017-01-13 12:56:33 +01:00
Michał Janiszewski 09ecf0b73c Fix possible null dereferences 2017-01-13 12:35:26 +01:00
Michał Janiszewski 90f7a3cf4f Have at least one Travis job in release configuration 2017-01-13 12:19:35 +01:00
Michał Janiszewski 0a36af19e4 Mark classes as final to help devirtualisation 2017-01-13 12:12:50 +01:00
Michał Janiszewski 85c6ed778b Add overrides in TestTrack.cpp 2017-01-13 11:44:14 +01:00
Michał Janiszewski 68b484464a Make GCC warn about duplicated condition 2017-01-13 11:44:14 +01:00
Michał Janiszewski 411d1fff18 Make GCC suggest final, override keywords 2017-01-13 11:44:14 +01:00
Michał Janiszewski 7d7285cdaa Add more Warnings to CMakeLists 2017-01-13 11:44:14 +01:00
Michał Janiszewski 33dcb1a506 Rename types to avoid shadowing 2017-01-13 10:57:00 +01:00
Michał Janiszewski d45337464f Include libzip as system library to fix issues in MinGW build 2017-01-13 10:02:18 +01:00