Ted John
|
c389228141
|
Merge Localisation/master into OpenRCT2/develop.
|
2015-08-01 04:00:15 +01:00 |
Ted John
|
1d86e2b6cd
|
Merge pull request #1712 from olegv11/develop
Implemented sub_6A87BB, sub_6A8ACF and sub_6A8B12
|
2015-07-31 12:39:32 +01:00 |
olegv11
|
8ea6adc555
|
Implemented sub_6A87BB (now update_path_wide_flags), sub_6A8ACF and sub_6A8B12
|
2015-07-31 13:38:34 +03:00 |
olegv11
|
2b6cfdec1d
|
Added a helper function footpath_element_is_wide
|
2015-07-31 12:43:57 +03:00 |
Ted John
|
5923b84f48
|
Merge pull request #1711 from Gymnasiast/disable-integrity-check
Disable integrity check for data files
|
2015-07-30 20:30:59 +01:00 |
Gymnasiast
|
fc844b5148
|
Disable integrity check for data files
|
2015-07-30 19:47:23 +02:00 |
Ted John
|
192289de87
|
Merge Localisation/master into OpenRCT2/develop.
|
2015-07-30 04:00:13 +01:00 |
IntelOrca
|
6f1aca52f5
|
fix #1657
|
2015-07-30 00:26:32 +01:00 |
Ted John
|
27193a3c7c
|
Merge pull request #1708 from Gymnasiast/large-list-scroll
Fix scrollbar getting stuck on large lists
|
2015-07-29 16:50:50 +01:00 |
Ted John
|
4f46707a2e
|
Merge pull request #1701 from Gymnasiast/name-ride-type-flag-2
Name RIDE_TYPE_FLAG_21
|
2015-07-29 16:50:37 +01:00 |
Gymnasiast
|
7a445467a4
|
Use unsigned 16-bit integer
|
2015-07-29 16:53:04 +02:00 |
Ted John
|
ee64219f55
|
Merge pull request #1707 from Gymnasiast/junior-rc-reverse-incline
Reinstate Reverse Inclined Shuttle for Junior RC (like in RCT1), fix comments and whitespace
|
2015-07-29 11:57:55 +01:00 |
Ted John
|
bfac77aa8a
|
Merge pull request #1706 from Gymnasiast/patch-4
GB: Fix use of American English spelling
|
2015-07-29 11:54:48 +01:00 |
Ted John
|
10fc123228
|
Merge pull request #1699 from Gymnasiast/name-flags
Name a park flag and a TD6 flag.
|
2015-07-29 11:54:24 +01:00 |
Ted John
|
1683900d4f
|
Merge pull request #1704 from PFCKrutonium/patch-1
Add cmake to install.sh
|
2015-07-29 11:51:01 +01:00 |
Gymnasiast
|
a89cee3abf
|
Fix scrollbar getting stuck on large lists
|
2015-07-29 11:04:38 +02:00 |
Gymnasiast
|
e7b36632c5
|
Reinstate Reverse Inclined Shuttle for Junior RC (like in RCT1), fix comments and whitespace
|
2015-07-29 10:43:13 +02:00 |
Michael Steenbeek
|
e16b6fb2d0
|
GB: Fix use of American English
|
2015-07-29 08:46:32 +02:00 |
Gymnasiast
|
f12cbeb22b
|
Rename var_6C to flags2 and put all know flags of it into an enum
|
2015-07-29 08:43:04 +02:00 |
Krutonium
|
238a632bd6
|
Add cmake to install.sh
Mostly because it isn't installed and needs to be.
|
2015-07-29 01:11:25 -04:00 |
Ted John
|
8282802574
|
Merge Localisation/master into OpenRCT2/develop.
|
2015-07-29 04:00:14 +01:00 |
Ted John
|
e0d4bdd6b0
|
Merge pull request #1700 from Gymnasiast/name-peep-flag
Name PEEP_FLAGS_19
|
2015-07-28 22:25:07 +01:00 |
Ted John
|
7003428886
|
Merge pull request #1702 from Gymnasiast/patch-3
Update changelog.txt
|
2015-07-28 22:23:38 +01:00 |
Michael Steenbeek
|
af5a85c4ec
|
Update changelog.txt
|
2015-07-28 21:47:18 +02:00 |
Gymnasiast
|
5785530e00
|
Name RIDE_TYPE_FLAG_21
|
2015-07-28 21:28:29 +02:00 |
Gymnasiast
|
4e8d5572cc
|
Name PEEP_FLAGS_19
|
2015-07-28 21:16:50 +02:00 |
Gymnasiast
|
ade8779195
|
Name a park flag and a TD6 flag.
|
2015-07-28 20:44:44 +02:00 |
Ted John
|
2fc658e346
|
Merge pull request #1697 from Gymnasiast/guests-given-date
Allow setting 'Guests at given date' in increments of 50, with a minimum of 250
|
2015-07-28 19:39:45 +01:00 |
Ted John
|
3802f78a06
|
Merge pull request #1698 from duncanspumpkin/peep
Peep Pathfinding functions
|
2015-07-28 19:38:14 +01:00 |
Duncan Frost
|
bf59c164f8
|
Start implementing main path find function.
|
2015-07-28 18:34:33 +01:00 |
IntelOrca
|
3a07af140b
|
Implement more peep path finding
|
2015-07-28 18:33:46 +01:00 |
IntelOrca
|
065b9bedbd
|
implement sub_694BAE
|
2015-07-28 18:33:40 +01:00 |
Duncan Frost
|
481e286dd9
|
Implemented start of guest_path_finding
|
2015-07-28 18:33:18 +01:00 |
Gymnasiast
|
88f4185b3b
|
Allow setting 'Guests at given date' in increments of 50, with a minimum of 250
|
2015-07-28 19:17:25 +02:00 |
Ted John
|
ea130a6126
|
Merge pull request #1694 from Gymnasiast/remove-six-flags-branding-and-limitations-2
Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag
|
2015-07-28 12:08:47 +01:00 |
Gymnasiast
|
9976b9673a
|
Remove rest of Six Flags branding.
|
2015-07-28 10:13:16 +02:00 |
Ted John
|
c35d1ce65f
|
Merge Localisation/master into OpenRCT2/develop.
|
2015-07-28 04:00:14 +01:00 |
Gymnasiast
|
5ed8948e4f
|
Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag
|
2015-07-27 21:47:55 +02:00 |
Duncan
|
56172c6b1b
|
Merge pull request #1693 from Gymnasiast/fix-1-week-remaining
Fix '1 weeks remaining'
|
2015-07-27 16:54:06 +01:00 |
Gymnasiast
|
65900982c4
|
Fix '1 weeks remaining'
|
2015-07-27 17:33:22 +02:00 |
Duncan
|
cfb8f3ae0a
|
Merge pull request #1691 from Gymnasiast/more-obsolete-strings
Mark more obsolete strings
|
2015-07-27 12:23:30 +01:00 |
Duncan
|
e9d676ef65
|
Merge pull request #1692 from Gymnasiast/fix-remaining-weeks
Fix display of remaining marketing campaign weeks
|
2015-07-27 12:22:32 +01:00 |
Gymnasiast
|
38f031655c
|
Fix display of remaining marketing campaign weeks
|
2015-07-27 10:34:19 +02:00 |
Gymnasiast
|
c2fe82dcb7
|
Mark more obsolete strings
|
2015-07-27 10:16:08 +02:00 |
Ted John
|
0ef9627058
|
Merge Localisation/master into OpenRCT2/develop.
|
2015-07-27 04:00:15 +01:00 |
Ted John
|
30ee1096b7
|
Merge pull request #1684 from Gymnasiast/longer-marketing-campaigns-squash
Allow running marketing campaigns for up to 12 weeks
|
2015-07-26 21:48:39 +01:00 |
Gymnasiast
|
777065e6a6
|
Allow running marketing campaigns for up to 12 weeks
|
2015-07-26 22:36:12 +02:00 |
Ted John
|
8bfdbdec65
|
Merge pull request #1687 from Gymnasiast/fix-intro-option
Remove Infogrames disclaimer from intro and fix config option
|
2015-07-26 21:33:26 +01:00 |
IntelOrca
|
3de7a456f5
|
Merge branch 'Gymnasiast-plural-inspection-time' into develop
|
2015-07-26 21:31:03 +01:00 |
Matt Layher
|
06f2adb9d6
|
Properly merge #1672: incorrect plural form for last inspection time, fixes #1513, closes #1672
|
2015-07-26 21:30:29 +01:00 |