mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00
Code Issues Releases Wiki Activity
15,029 Commits 8 Branches 59 Tags
74dd8a4eacd214a5accba42ab1c9c4ea930f0d31
Commit Graph

3245 Commits

Author SHA1 Message Date
Michael Steenbeek
e6dcf43680 Adjust money-string functions for exchange rates 2018-06-15 09:36:17 +02:00
Gymnasiast
fe54cf5ee6 Allow forcing decimals 2018-06-15 09:36:17 +02:00
Ted John
fdb1d98868 Move rain window loop to libopenrct2ui (#7684) 2018-06-15 07:46:04 +01:00
Aaron van Geffen
e1f7efc7e9 Merge pull request #7665 from AaronVanGeffen/git_describe_version 
Use `git describe` to express version in terms of closest tag
 2018-06-14 16:57:25 +02:00
Aaron van Geffen
fd74c6c93f Suppress branch info for releases on master. 2018-06-14 15:31:31 +02:00
spacek531
b79239586a Fix #7657: All vehicles ring a tram bell when crossing paths 2018-06-14 13:36:35 +02:00
Andy Ford
ea371144e7 Fix #7643: No Money scenarios can have funding set to zero 
If research funding is set to no funding and scenario money is turned
off, then update research at the normal rate.
 2018-06-14 13:17:09 +02:00
Ted John
9e9c2c072e Fix #7678: Crash when Loading or starting a new game... 
...while having object selection window open

Close the object manager window before loading the next park.
 2018-06-13 23:29:05 +01:00
Hielke Morsink
6b22a9d38b Merge pull request #7586 from Broxzier/refactor/banner-ride-index 
Banner code cleanups
 2018-06-13 21:48:04 +02:00
Hielke Morsink
6aa4704ea1 Use uint8 for ride index iterator 2018-06-13 15:44:20 +02:00
Ted John
7373987f0a Merge pull request #6978 from tobiaskohlbau/refactor/network 
HTTP: Refactor into modern C++
 2018-06-12 21:50:46 +01:00
Ted John
9a94139242 Fix Linux builds 2018-06-12 21:18:13 +01:00
pkubaj
fae367ccf9 Fix compilation with FreeBSD (#7668) 2018-06-12 20:46:34 +01:00
pkubaj
7fbbce5712 Include cstddef 
This fixes compilation on FreeBSD and LLVM 6.0.
 2018-06-12 14:38:59 +02:00
Aaron van Geffen
56250b43ab Use git describe to express version in terms of closest tag. 2018-06-12 00:25:04 +02:00
Aaron van Geffen
2cb0947620 Fix #7535: Render ẞ ligature in sprite font. 2018-06-11 22:34:01 +02:00
Aaron van Geffen
760f274d81 Fix #7616: Use unicode dingbats for +/- buttons in CJK languages. 2018-06-11 22:20:51 +02:00
Hielke Morsink
28a4cafffe Use constexpr and pragma once in banner.h 
And fix two occurances where `BANNER_NULL` was used wrongly.
 2018-06-11 14:47:50 +02:00
Hielke Morsink
7355b497a1 Use new banner index type 
BannerIndex is defined in common.h (like some other types such as money32 and rct_string_id), so that banner.h wouldn't have to be includede everywhere. Later on, it may be nicer to have a custom types file instead of putting them all in common.h.
 2018-06-11 13:29:41 +02:00
Hielke Morsink
08035f42f7 Fix compilation of SignSetNameAction.hpp 
This header was missing some includes that it depends on. Some were included by other headers.
 2018-06-11 13:29:32 +02:00
Hielke Morsink
388c2f9cb6 bump network version 2018-06-11 13:29:31 +02:00
Hielke Morsink
878288de76 Check for banner index correctly 
At some places, BANNER_NULL and BANNER_INDEX_NULL were mixed, and at one point even MAX_BANNERS, causing the 250th banner to not be initialized properly. This commit makes the uses of those defines correct, and changes all relevant functions to return uint8 instead of sint32.
 2018-06-11 13:21:48 +02:00
Hielke Morsink
ead97a4638 Split colour into union with ride index 
The colour field in the banner object is also used to store the ride index when a banner is linked to a ride. This commit turns this field into a union with both named fields, to make the code clearer.

It also changes the return types of related functions to uint8 instead of sint32, and makes use of the RIDE_ID_NULL define where applicable.
 2018-06-11 13:21:48 +02:00
Aaron van Geffen
f1d4e5b596 Rename Http namespace, add default initialisers. 2018-06-11 11:19:04 +02:00
Michał Janiszewski
bcd4e9c50b Merge pull request #6284 from janisozaur/compiler-warnings 
Compiler warnings
 2018-06-11 11:06:34 +02:00
Tobias Kohlbau
62c25d88fb HTTP: refactor http into modern C++ 
Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
 2018-06-11 10:24:19 +02:00
Michał Janiszewski
5174119491 Disable -Wdocumentation for FreeType includes 2018-06-11 10:17:10 +02:00
Ted John
b043428cf0 Merge pull request #6998 from JeroenDStout/railway-crossings-wait 
Railway crossing behaviour for peeps and vehicles
 2018-06-11 09:09:07 +01:00
Michał Janiszewski
1d28826b79 Fix -Wdocumentation and add it to default warnings 2018-06-11 09:52:54 +02:00
Ted John
510786fc1a Fix Linux builds 2018-06-11 01:22:18 +02:00
Ted John
3096c4de00 Remove window internals from TileInspector logic 2018-06-11 00:09:00 +01:00
Ted John
04da3be824 Move Widget.cpp to libopenrct2ui 2018-06-11 00:04:41 +01:00
Ted John
a4d6a45e78 Move window_all_wheel_input to libopenrct2ui 2018-06-10 23:56:05 +01:00
Ted John
370a6300c0 Move ViewportInteraction to libopenrct2ui 2018-06-10 23:39:56 +01:00
Ted John
ae6af47341 Move TitleSequencePlayer to libopenrct2ui 2018-06-10 23:39:56 +01:00
Ted John
bc1d2252aa Remove window dependency from Ride.cpp 2018-06-10 23:34:36 +01:00
Ted John
5a368ce6d9 Move theme code to libopenrct2ui 2018-06-10 23:34:27 +01:00
Ted John
e6e61c3a2f Move create window code to libopenrct2ui 2018-06-10 23:34:20 +01:00
Ted John
e38f4df575 [wip] Move themes to libopenrct2ui 2018-06-10 23:34:12 +01:00
Ted John
85dc161c5a Add SetMainView to WindowManager 2018-06-10 23:33:52 +01:00
Ted John
fac0960c6e Increment network version 2018-06-10 23:01:27 +01:00
Ted John
b4d3806614 Unblock tiles when vehicles are removed from ride 2018-06-10 22:59:58 +01:00
Ted John
d1d9f0a86a Add debug drawing option for blocked tiles 
Replace old unused original drawing code toggle options with new option to show which tiles are blocked by vehicles.
 2018-06-10 22:59:58 +01:00
Ted John
c300f873f5 Refactor peep check for vehicle 2018-06-10 22:59:58 +01:00
Ted John
e9069e4f0a Add const qualifiers 2018-06-10 22:59:58 +01:00
Jeroen D Stout
ad684b1e57 Add claxon to vehicle reserving initial crossing tile 2018-06-10 22:59:58 +01:00
Jeroen D Stout
13017568db Prevent peep from being blocked while already on blocked tile 2018-06-10 22:59:58 +01:00
Jeroen D Stout
299d2e82ab Limit amount of path being reserved at single crossing 2018-06-10 22:59:58 +01:00
Jeroen D Stout
547973066c Add check for peep walking update to prevent walking onto blocked tiles 2018-06-10 22:59:58 +01:00
Jeroen D Stout
244209df56 Add vehicle_update_crossings for validating crossing tiles upon entering a tile 2018-06-10 22:59:58 +01:00