Ted John
390a03a540
Remove seat rotation from RCT1 vehicle struct
2017-01-26 23:30:16 +00:00
Ted John
f52286a442
Import and fix vehicle links
2017-01-26 23:30:16 +00:00
Ted John
604e17007f
Copy over some properties
2017-01-26 23:30:16 +00:00
Ted John
7a4ca989ba
Add beginnings of vehicle importing
2017-01-26 23:30:16 +00:00
Ted John
b6b981b826
Fix typo in changelog
...
[ci skip]
2017-01-26 23:25:50 +00:00
Ted John
53c788d9d9
Fix #5003 : Able to remove entrance/exit of unedittable rides
2017-01-26 23:24:59 +00:00
Michał Janiszewski
8d1fbcf188
Raise network version to 33
2017-01-26 23:00:56 +01:00
zaxcav
f5ae931406
Replace reuse of test_edge with new variable next_test_edge
...
Value of test_edge is needed for checking all path tiles placed with
zero clearance at that location.
2017-01-26 22:59:54 +01:00
Duncan
f8d6d01c0a
Merge pull request #5017 from duncanspumpkin/refactor_peep
...
Start refactor of peep code to label known addresses
2017-01-26 21:52:45 +00:00
duncanspumpkin
61bb44cd22
Bump network version just in case
2017-01-26 19:52:01 +00:00
Michał Janiszewski
aeef3a7d5d
Remove trailing whitespace
2017-01-26 19:51:31 +00:00
duncanspumpkin
98f483e4bb
Fix trailing white space. Fixed space indent
2017-01-26 19:51:31 +00:00
duncanspumpkin
d951c500c5
Refactor of peep data and label known addresses
...
Fixes #4545 . Incorrect sprite image for chicken and juice
2017-01-26 19:51:30 +00:00
OpenRCT2 git bot
a72cf41fcf
Merge Localisation/master into OpenRCT2/develop.
2017-01-26 04:00:18 +00:00
duncanspumpkin
7cddd36feb
Fix RCT2 builds
...
Due to increased warnings unreachable code warning was causing a failure to compile.
2017-01-25 18:35:28 +00:00
Ted John
7eac99c9f0
Merge pull request #5113 from IntelOrca/feature/random-entertainer-skin
...
Set hired entertainers to a random costume.
2017-01-25 12:35:08 +00:00
Gymnasiast
8f81485c46
Correct spelling of 'block brakes', use constant
2017-01-25 02:33:17 +01:00
zaxcav
5424e7774c
Display cut height in Units when Height Label: Units is selected in the options. ( #5115 )
2017-01-25 00:53:25 +01:00
Ted John
f511918642
Update changelog
...
[ci skip]
2017-01-24 19:36:22 +00:00
Ted John
93762bf15f
Fix issues
2017-01-24 17:32:17 +00:00
Ted John
c40df001ca
Use sint32
2017-01-24 17:04:03 +00:00
Ted John
c699c91348
Pick random entertainer costume
2017-01-24 13:06:23 +00:00
Ted John
2900f38cc3
Allow entertainer costume to be given to game command
2017-01-24 13:06:23 +00:00
Michael Steenbeek
c9ab0d11b3
Add diagonal flat-to-steep junior rc fix to changelog
2017-01-24 13:37:03 +01:00
Michał Janiszewski
1e6ba077c1
Merge pull request #5100 from janisozaur/fix-ghosts
...
Fix some ghost consideration in peep AI
2017-01-24 11:50:58 +01:00
Michał Janiszewski
ceb77b489d
Fix map_get_path_element_at to not consider ghosts
2017-01-24 11:30:39 +01:00
Michał Janiszewski
88113ca952
Fix some ghost consideration in peep AI
...
This is a continuation of
https://github.com/OpenRCT2/OpenRCT2/pull/5094 .
While the previous PR cured some desyncs, the real issue remained –
logic of the game considers ghost elements. This change fixes it, to
some extent.
The problem here is we already remove ghosts when interacting over
network (e.g. `footpath_provisional_remove` in `footpath_place_real`),
but this happens only when such a game command is executed in OpenRCT2.
Whenever SV6 gets imported, path map elements already have had edges
calculated for them, neighbours being ghost or not, and we don't update
it. OpenRCT2/OpenRCT2#5094 is one, naïve, way to solve, the other option
would be to recalculate all the paths whenever we load SV6.
2017-01-24 11:29:58 +01:00
Michael Steenbeek
a4d5f764f4
Implement diagonal flat-to-steep slopes on the Junior RC, fixes #4584
2017-01-24 09:26:30 +01:00
OpenRCT2 git bot
89b7a173a4
Merge Localisation/master into OpenRCT2/develop.
2017-01-24 04:00:24 +00:00
Aaron van Geffen
990b9b8708
Fix #5005 : The Right Arrow in Horizontal scroll bars does not work anymore. ( #5107 )
...
Both horizontal and vertical scrollbars had a malfunctioning widget: both the
right and bottom widgets weren't fired properly.
The bug was less noticeable for vertical scrollbars, as clicking the widget would
be treated as clicking empty space, which did not happen for the horizontal
scrollbar.
This patch fixes the underlying inconsistencies, making sure the widgets for
both types of scrollbars work -- when using either scrollbar, or when combined.
2017-01-23 19:06:53 +01:00
Ted John
04a1e5a488
Merge pull request #5108 from IntelOrca/refactor/game-init
...
Refactor game initialisation
2017-01-23 17:31:53 +00:00
Ted John
3379143011
Improve S4 / S6 import initialisation
2017-01-23 13:00:46 +00:00
Ted John
a0fc01d54e
Clean up game init a bit more
2017-01-23 12:55:59 +00:00
Ted John
288f4782b6
Make dedicated method for window set location
2017-01-23 12:48:10 +00:00
Ted John
abac2ca614
Consolidate game initialisation into single method
2017-01-23 12:44:27 +00:00
Ted John
ef6fa35323
Merge pull request #5106 from IntelOrca/refactor/use-scenario-repo
...
Refactor / use scenario repository as dependency
2017-01-23 12:08:23 +00:00
Aaron van Geffen
3437b26db8
Clean up switch statement for map window
2017-01-22 23:06:56 +01:00
Ted John
e36dc622ad
Pass scenario repository dependency to TitleSequencePlayer
2017-01-22 22:04:07 +00:00
Ted John
d5f2ea814a
Use scenario repository to load SFMM in title sequence
2017-01-22 21:57:14 +00:00
Ted John
efb64603eb
Only create OpenGL window when necessary
...
Currently the game window is always created with an OpenGL context which then means that opengl32.dll and other modules are loaded. The OpenGL window flag will now only be used if the config drawing engine is set to OpenGL. This now means that a restart of the game is required when switching to the OpenGL drawing engine for Windows.
#5104
2017-01-22 21:38:08 +00:00
Ted John
41d1793355
Update changelog
...
[ci skip]
2017-01-22 21:35:44 +00:00
Michał Janiszewski
da6fac62f1
Merge PR #4673 from zaxcav/paintClip: cut-away view
...
cut-away view
2017-01-22 21:31:22 +01:00
zaxcav
a4b476ac92
Minor changes as requested by reviewer.
2017-01-22 21:21:00 +01:00
zaxcav
80b0df3b74
Add formatting to tooltip texts; Fix printing of raw clip height value.
2017-01-22 21:21:00 +01:00
zaxcav
6a4ced856e
Minor code changes per reviewer comments.
2017-01-22 21:17:08 +01:00
zaxcav
0d81835224
Correct mistakes during rebase.
2017-01-22 21:17:08 +01:00
zaxcav
93e5e80e26
Correct code alignment in widget placement code (tab based).
2017-01-22 21:11:42 +01:00
zaxcav
e8f97da2c6
Implement further changes as requested by reviewer.
...
Add toggling displayed clip height value between the raw value and value in units.
2017-01-22 21:11:42 +01:00
zaxcav
25e57ca50d
Updated code as requested by reviewer.
...
Removed display of raw cut height value.
Changed display of cut height in METRIC/SI from 1DP to 2DP to display odd raw heights with accurate value.
Changed display of cut height in IMPERIAL to 1DP to display odd raw heights with accurate value.
2017-01-22 21:02:19 +01:00
zaxcav
87a80ac956
Minor code cleanups.
...
Adjusted sprite trimming.
2017-01-22 20:57:17 +01:00