1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Commit Graph

4102 Commits

Author SHA1 Message Date
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
4e8d5572cc Name PEEP_FLAGS_19 2015-07-28 21:16:50 +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
Duncan
6f0ad6a916 Merge pull request #1686 from Gymnasiast/disable-tutorial-button
Disable tutorial button
2015-07-26 17:00:56 +01:00
Duncan
7c2cd22dcd Merge pull request #1685 from Gymnasiast/reorder-options-window
Reorder Options window
2015-07-26 16:59:55 +01:00
Gymnasiast
ce7a0ac27b Remove Infogrames disclaimer from intro and fix config option 2015-07-26 16:07:58 +02:00
Gymnasiast
19d2bbf919 Disable tutorial button 2015-07-26 15:14:38 +02:00
Gymnasiast
bcdfdcb7a0 Reorder Options window 2015-07-26 14:37:27 +02:00
Duncan Frost
568915d7fb Fix peeps not moving when footpath changed.
Fixes #1604
2015-07-26 07:41:44 +01:00
Ted John
0d8d797f15 Merge Localisation/master into OpenRCT2/develop. 2015-07-26 04:00:14 +01:00
Ted John
f4216227f4 Merge pull request #1682 from Gymnasiast/upper-case-banners
Add feature to make banners display text in all caps
2015-07-25 20:50:02 +01:00
Gymnasiast
ae32b463c0 Add feature to make banners display text in all caps 2015-07-25 21:38:23 +02:00
IntelOrca
801d2ec341 implement window_maze_construction_mousedown 2015-07-25 17:48:00 +01:00
Ted John
63564998d9 Merge pull request #1680 from Gymnasiast/patch-2
Update and mark obsolete strings
2015-07-25 17:44:45 +01:00
Duncan
0133c8f315 Merge pull request #1681 from Gymnasiast/name-track-pieces
Put names on every track piece with correct spacing, closes #1592
2015-07-25 17:41:23 +01:00
Michael Steenbeek
5028e83b52 Align comments with tab spacing of 4 2015-07-25 18:18:27 +02:00
Michael Steenbeek
644c4a9a59 Merge pull request #11 from kevinburke/name-track-pieces
Put names on every track piece
2015-07-25 18:14:16 +02:00
Michael Steenbeek
290fbfb6e4 Fix typo 2015-07-25 18:09:30 +02:00
Michael Steenbeek
e3c275644b Update and mark obsolete strings 2015-07-25 18:07:38 +02:00
Duncan
3d4cbfff6e Merge pull request #1679 from zsilencer/bugfixes
fix couple of bugs
2015-07-25 15:55:34 +01:00
zsilencer
c4a8d27648 fix couple of bugs 2015-07-25 08:50:59 -06:00
Ted John
2d11e54fa7 Merge pull request #1670 from duncanspumpkin/peep
Peep
2015-07-25 11:32:25 +01:00
Duncan Frost
812010001d Implement guest surface path finding 2015-07-25 11:16:59 +01:00
Ted John
4e8593be8c Merge pull request #1674 from zsilencer/decompiling
implement map_can_construct_with_clear_at
2015-07-25 11:12:29 +01:00
Duncan
94b04c011c Merge pull request #1671 from janisozaur/develop
Refactor rct_news_item
2015-07-25 10:39:41 +01:00