1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Commit Graph

10713 Commits

Author SHA1 Message Date
Gymnasiast
39d413b781 Fix Megaworld Park crashing on opening, fix some colour schemes 2017-01-26 23:30:16 +00:00
Gymnasiast
476f1fad2b Use constants for null sprite location and maximum vehicles 2017-01-26 23:30:16 +00:00
Gymnasiast
02da9caf5d Fix formatting and remove warning silencer 2017-01-26 23:30:16 +00:00
Gymnasiast
803c4ddfe5 Fix minigolf import 2017-01-26 23:30:16 +00:00
Gymnasiast
653be68b98 Don't assert on incorrect colour or sprite type 2017-01-26 23:30:16 +00:00
Gymnasiast
69a79fd00a Import water colour 2017-01-26 23:30:16 +00:00
Gymnasiast
3d0c357fbf Fix vehicle direction 2017-01-26 23:30:16 +00:00
Michael Steenbeek
b47694a9f7 Fix typo 2017-01-26 23:30:16 +00:00
Gymnasiast
54c4f0f1f3 Fix import of more vehicles, fix some colours 2017-01-26 23:30:16 +00:00
Gymnasiast
cc4576b72a Fix colour lookup for vehicle sprites 2017-01-26 23:30:16 +00:00
Gymnasiast
51c812458e Extract colour lookup functions 2017-01-26 23:30:16 +00:00
Gymnasiast
d077cd1341 Create table for converting colour schemes, fix some vehicles, fix river rapids 2017-01-26 23:30:16 +00:00
Gymnasiast
63d639db5d Fix negative queue lengths, fix monorail, fix chairlift crashes 2017-01-26 23:30:16 +00:00
Ted John
c1d532be01 Fix colour conversion out of range 2017-01-26 23:30:16 +00:00
duncanspumpkin
e3e435c9f7 Fix trains splitting up into multiple vehicles 2017-01-26 23:30:16 +00:00
Gymnasiast
dacfba9eda Import more fields, correct more vehicles 2017-01-26 23:30:16 +00:00
Gymnasiast
fc7b03747e Import ride measurements (with bugs) 2017-01-26 23:30:16 +00:00
Gymnasiast
e3d197e856 Import Corkscrew train correctly, import colours 2017-01-26 23:30:16 +00:00
Gymnasiast
f7f744f59b Use a map to convert vehicle subentry and restore seat rotation 2017-01-26 23:30:16 +00:00
Gymnasiast
8646f5d4ee Use speed, friction from source vehicle 2017-01-26 23:30:16 +00:00
Ted John
6c339787ee Fix peep links in vehicles 2017-01-26 23:30:16 +00:00
Gymnasiast
748d82f517 Import peeps in vehicles as well 2017-01-26 23:30:16 +00:00
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