1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Commit Graph

4690 Commits

Author SHA1 Message Date
duncanspumpkin
31e6942ff0 Fix #1761. Issue caused by or = instead of != 2015-10-15 21:03:29 +01:00
Ted John
fdfe52fc19 Merge pull request #2057 from Gymnasiast/show-vehicles-from-other-track-types
Show vehicles from other track types
2015-10-15 12:57:57 +01:00
Michael Steenbeek
eaf23f8e76 Merge pull request #12 from IntelOrca/show-vehicles-from-other-track-types
fix dropdown 64 item support and remove old RCT2 addresses
2015-10-15 09:41:29 +02:00
IntelOrca
0442f08aae remove redundant dropdown assignment 2015-10-14 21:16:10 +01:00
IntelOrca
3855d70d1a fix dropdown 64 item support and remove old RCT2 addresses 2015-10-14 21:01:04 +01:00
Gymnasiast
d71ca1f376 Extend dropdowns to hold up to 64 items (with bugs) 2015-10-14 16:19:50 +02:00
Ted John
e6359f486b Merge Localisation/master into OpenRCT2/develop. 2015-10-14 04:00:16 +01:00
Ted John
80e973887c Merge pull request #2059 from janisozaur/types
type and const fixes for sawyercoding
2015-10-13 19:15:29 +01:00
Ted John
2db3f4ee23 Merge Localisation/master into OpenRCT2/develop. 2015-10-13 04:00:16 +01:00
Michał Janiszewski
9572f1b532 type and const fixes for sawyercoding 2015-10-12 23:09:49 +02:00
Duncan
d2398b65bb Merge pull request #2048 from clamburger/update_sub_6960AB
Clean up sub_6960AB function (peep_should_go_on_ride)
2015-10-12 21:49:46 +01:00
Gymnasiast
a1cc3e4759 Fix vehicle dropdown when 'Select-by-track-type' off and 'Show vehicles from other track types' on 2015-10-12 16:01:58 +02:00
Gymnasiast
105280a082 Introduce cheat option to show vehicles from other track types 2015-10-12 15:58:15 +02:00
Duncan
1629c75fb3 Merge pull request #2054 from CaioAlonso/develop
Fixes the portuguese (br) language name
2015-10-11 20:26:09 +01:00
Caio Alonso
63603871ea fixes the portuguese (br) language name 2015-10-11 15:26:18 -03:00
Ted John
66dd53dd36 Merge pull request #2050 from OpenRCT2/game-command-land-smooth
Implement mountain tool + enhanced functionality.
2015-10-11 18:11:18 +01:00
IntelOrca
6cd3b41065 fix overflows / underflows with mountain tool 2015-10-11 12:31:57 +01:00
IntelOrca
d5ae4a55ff allow 1 to 64 mountain tool size 2015-10-11 12:26:33 +01:00
IntelOrca
6c38ab44fa refactor map smooth game command 2015-10-11 11:39:01 +01:00
Ted John
fbd2598ac3 Merge Localisation/master into OpenRCT2/develop. 2015-10-11 04:00:16 +01:00
IntelOrca
969324032e implement map smooth game command 2015-10-11 02:23:39 +01:00
IntelOrca
8ec4d61739 add callfunc wrappers for the last three remaining game commands and remove original call table 2015-10-10 20:26:17 +01:00
Sam Horn
49cf5e3774 Moved the nausea thresholds into a C array 2015-10-11 04:07:14 +10:00
Sam Horn
55d6666f13 Added an enum for flags used in peep_should_go_on_ride 2015-10-11 03:21:33 +10:00
Sam Horn
58b7df8fd7 Renamed ride->first_peep_in_queue to last_peep_in_queue 2015-10-11 03:03:59 +10:00
Sam Horn
3975af93f4 Renamed ride->var_114 to undercover_portion and updated comments 2015-10-11 02:51:03 +10:00
Sam Horn
75263034e5 Use GET_PEEP macro 2015-10-10 23:15:56 +10:00
Sam Horn
b0437746a9 Fixed min and max intensity being swapped 2015-10-10 21:34:37 +10:00
Sam Horn
1b2a7e62a2 Identified 0x00982392 as a nausea lookup array 2015-10-10 21:31:56 +10:00
Ted John
6c84b06fbd Merge pull request #2047 from janisozaur/memory
Memory
2015-10-10 11:57:51 +01:00
Ted John
06f7740518 Merge pull request #2039 from HaasJona/peep_count
Recalculate peep count after loading a save
2015-10-10 11:55:18 +01:00
IntelOrca
955f9a02e9 fix ride rating underflows, #2031 2015-10-10 11:54:19 +01:00
Jonathan Haas
3a11bbb6d4 Recalculate peep count after loading a save 2015-10-10 12:50:29 +02:00
Sam Horn
3f84778369 Removed extra spaces 2015-10-10 19:00:37 +10:00
Sam Horn
2b66253d28 Replaced remaining gotos with function calls 2015-10-10 18:53:48 +10:00
duncanspumpkin
5a59e7fed4 Fix issue with last commit 2015-10-09 22:25:30 +01:00
duncanspumpkin
59cdff7055 Potential fix to #639.
The scenario name was missing its null to indicate the end of the string. This would cause scenarios to have odd fileNames that are compared against to compare a scenario against the scenario list
2015-10-09 22:11:28 +01:00
Michał Janiszewski
74d0b033df Name RCT2_ADDRESS_PALETTE 2015-10-09 20:20:05 +02:00
Michał Janiszewski
fb9a5833d6 Fix override offsets while loading LanguagePack
When loading language pack, a check is made not to double entries. This
check was wrong, because it tried to use offsets as pointers to strings.

These offsets are later rewritten to actual pointers in remaining part
of LanguagePack::LanguagePack
2015-10-09 20:19:58 +02:00
Michał Janiszewski
6dd04bbb1a Don't copy more memory than we own 2015-10-09 20:19:34 +02:00
Sam Horn
a5b9b356a0 Cleaned up the queue logic 2015-10-09 22:11:15 +10:00
Sam Horn
ceeaa34ac8 Start work on cleaning up sub_6960AB 2015-10-09 17:12:48 +10:00
Ted John
33655afcf9 Merge pull request #2045 from Gymnasiast/name_peep_flags_5
Name PEEP_FLAGS_5
2015-10-08 12:14:47 +01:00
Gymnasiast
3590b1c1b9 Adjust comment 2015-10-08 10:58:17 +02:00
Gymnasiast
dfd0c52b7e Name PEEP_FLAGS_5 2015-10-08 10:47:14 +02:00
Ted John
bfc776b3dc Merge pull request #2040 from xperia64/develop
Add download function to install.sh that delegates to curl or wget
2015-10-07 23:02:31 +01:00
xperia64
24e13f73a9 Make curl follow redirects 2015-10-07 17:48:46 -04:00
xperia64
6403b0a47f Add download function to install.sh that delegates to curl or wget 2015-10-07 17:23:03 -04:00
Ted John
03c054b072 Merge pull request #2026 from xperia64/develop
Use wget to get orctlibs.zip in install.sh
2015-10-07 12:10:00 +01:00
Ted John
700f0c840f Merge pull request #2036 from zsilencer/decompiling
implement peep_give_real_name
2015-10-07 12:09:22 +01:00