1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 04:53:12 +01:00
Commit Graph

3098 Commits

Author SHA1 Message Date
Ted John
2fa9b1a5a0 Merge pull request #1075 from Gymnasiast/develop
Extend the RCT1 colour scheme to the scenario select and start new campaign window
2015-05-17 13:45:12 +01:00
Ted John
e7cbd8bca0 Merge pull request #1074 from duncanspumpkin/bugs
Fix out of bounds errors
2015-05-17 13:44:05 +01:00
Gymnasiast
8d0ab82d65 Extend the RCT1 colour scheme to the scenario select and start new campaign window 2015-05-17 12:55:26 +02:00
Duncan Frost
0701bacc71 Fix yellow arrow when closing construction window.
Small refactor of map selection globals.
Fixes #1062
2015-05-17 08:49:39 +01:00
Duncan Frost
328abd1d45 Fix out of bounds errors
Changed get_surface_element to bubble up the null mapElement to be taken care of by the calling function.
Added checks on the track functions to ensure that invalid coordinates do not call get_surface_element_at.
Fixes #1066 and Fixes #1057
2015-05-17 07:58:51 +01:00
Ted John
f1e3668127 Merge Localisation/master into OpenRCT2/develop. 2015-05-17 04:00:11 +01:00
IntelOrca
b762fccdb2 fix format codes that did not backtrack the null terminator. 2015-05-16 16:42:23 +01:00
Ted John
2675d79795 Merge pull request #1072 from Gymnasiast/develop
Add cheat option for lift hills up to 410 km/h,
2015-05-16 16:23:48 +01:00
Gymnasiast
02ba241385 Add cheat option for lift hills up to 410 km/h, fix a comment and some spaces 2015-05-16 17:16:09 +02:00
IntelOrca
cad8295c53 Merge Localisation/master into OpenRCT2/develop. 2015-05-16 10:27:15 +01:00
IntelOrca
6749146685 Merge branch 'trigger-death-land-rights-tool' into develop 2015-05-15 22:10:23 +01:00
IntelOrca
f7972f0d48 Merge branch 'land-rights-tool' of https://github.com/trigger-death/OpenRCT2 into trigger-death-land-rights-tool
Conflicts:
	data/language/english_uk.txt
2015-05-15 22:10:13 +01:00
Ted John
b4683351f9 Merge pull request #1067 from runelaenen/cheat-create-ride
[Cheat] Fix all rides
2015-05-15 21:59:25 +01:00
Robert Jordan
3940bf4538 Fixed spelling error in tooltip 2015-05-15 16:09:25 -04:00
Robert Jordan
730d2bb2e8 Added Buy to land rights tooltip 2015-05-15 16:08:37 -04:00
Robert Jordan
e3451df703 Fixed up strings 2015-05-15 16:06:59 -04:00
Robert Jordan
6d5a07f7ef Finished cleaning up land rights tool code 2015-05-15 15:19:36 -04:00
Runelaenen
fc7cae9e57 Updated tab and language
Removed the string from US.
Changed tab to 4 spaces in UK.

I'll add it to the /OpenRCT2/Language repo.
2015-05-15 18:53:31 +02:00
Robert Jordan
f18524151c Park Window Toggling 2015-05-15 11:53:28 -04:00
Robert Jordan
09cc46c1e6 Almost finished land rights tool 2015-05-15 11:28:27 -04:00
Runelaenen
69c89db87e Working code
Thanks to IntelOrca and Gymnasiast for the help :-)
2015-05-15 16:53:59 +02:00
Runelaenen
2144d9e787 Cheat fix all rides 2015-05-15 16:49:46 +02:00
Ted John
65a58e3177 Merge pull request #1065 from duncanspumpkin/track
Track Placement
2015-05-14 18:09:36 +01:00
Duncan Frost
aacdc12733 Finished mirror code. 2015-05-14 18:00:49 +01:00
IntelOrca
b8dcb71bc6 Merge Localisation/master into OpenRCT2/develop. 2015-05-14 17:24:37 +01:00
Duncan Frost
caa6547650 Started implementing track_mirror.
Ride and maze mirror already works.
Scenery still requires work.
2015-05-13 20:15:48 +01:00
Duncan Frost
88a43b34b0 Finish maze track placement
Fixed bugs related with maze placement as well.
2015-05-13 19:19:46 +01:00
Duncan Frost
fbdc2dad7b Added start of maze placement. Refactored slightly. 2015-05-13 19:19:45 +01:00
Duncan Frost
1f02b47a6c Implemented large/small scenery placement. Fix bugs.
There was a bug that was causing track creation to place scenery items in the incorrect location. This was caused by assuming a global variable was no longer in use.
2015-05-13 19:19:45 +01:00
Duncan Frost
ac55dd3e04 Add wall scenery support 2015-05-13 19:19:44 +01:00
Duncan Frost
9603e35834 Fix bugs in path placement 2015-05-13 19:19:43 +01:00
Duncan Frost
ed685688e2 More scenery_place.
There is a bug in the path code
2015-05-13 19:19:43 +01:00
Duncan Frost
49e02fdab8 Added more of scenery place 2015-05-13 19:19:42 +01:00
Duncan Frost
054bc8cac2 Started scenery placement 2015-05-13 19:19:41 +01:00
Duncan Frost
d7db2e27e0 Added entrance/exit placement. 2015-05-13 19:19:41 +01:00
Duncan Frost
01eb40de08 Fix bugs in ride placement
Tracks should now place and remove correctly.
Next task will be entrances/exits followed by scenery.
2015-05-13 19:19:40 +01:00
Duncan Frost
69c708b75d Added more to track_place 2015-05-13 19:19:39 +01:00
Duncan Frost
a8912e0696 Added more of track_place 2015-05-13 19:19:39 +01:00
Duncan
f367746964 Fix small mistake in flags 2015-05-13 19:19:38 +01:00
Duncan Frost
7d13cb9ac3 Started track_place 2015-05-13 19:19:38 +01:00
Duncan Frost
822c3f6932 Added game_command_place_track
Requires extensive testing.
Fixed a bug in the tracks.idx that would cause crash on track load fail.
2015-05-13 19:19:37 +01:00
Duncan Frost
66de066901 Added save_track_file. Fixed bugs.
Encountered bug where incorrect tracks would be displayed if the loading process failed.
Added checksum validation to loading code.
Increased the max rle length to match rct2.
2015-05-13 19:19:36 +01:00
Duncan Frost
64374e5ac4 Added maze to td6 code.
Small refactor of td6 struct to use flags with a note.
Refactor to split up td6 creation code
2015-05-13 19:19:35 +01:00
Duncan Frost
7418c74c9a Finished save track for tracked rides.
Still needs mazes to be done.
No noticable bugs so far.
2015-05-13 19:19:35 +01:00
Duncan Frost
9051f13520 Implemented sub_6c683d
This is some sort of function that gets the map element of the first part of a track segment.
It is also used to update the flashing colour when in construct mode
2015-05-13 19:19:34 +01:00
Duncan Frost
f6f671e27f Started .TD6 creation function.
Labelled known offsets from compare to ride structure.
2015-05-13 19:19:34 +01:00
Duncan Frost
dde9611343 Added td4 booster check.
Small refactor to use known structures
2015-05-13 19:19:33 +01:00
Ted John
fa75053e08 Merge pull request #1058 from trigger-death/develop
Land tool painting and text input sizes
2015-05-13 18:33:05 +01:00
Ted John
6988fc0d99 Merge pull request #1061 from trigger-death/fixtextboxcarot4
Fixed textbox carot color
2015-05-13 18:32:37 +01:00
Robert Jordan
3dd1bf96c6 If MAC is defined Cmd+V will be used instead. 2015-05-13 12:10:14 -04:00