mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,087 Commits 7 Branches 39 Tags 355 MiB
Commit Graph

4087 Commits

Author SHA1 Message Date
Ted John c35d1ce65f Merge Localisation/master into OpenRCT2/develop. 2015-07-28 04:00:14 +01: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
Michał Janiszewski 6adb384a7e Refactoring in news_item 
Now news_items are fetched only with exposed calls, which add a layer of
simple checks. I also switched few places to access a read-only version
of news_item.
 2015-07-25 11:31:17 +02:00
Duncan Frost bff00b29bf Fix more small pathfinding bugs. Fix unset memory errors 2015-07-25 10:12:51 +01:00
Duncan Frost 074b2a6909 Remove code offset comments, fix destination bug 2015-07-25 09:09:26 +01:00
Duncan Frost c93671af3f Small refactor 2015-07-25 08:57:19 +01:00
Duncan Frost 0ca26a7fca Fix #1430 2015-07-25 08:57:18 +01:00
Duncan Frost 9cf5240c90 Start implementing sub_693C9E 2015-07-25 08:57:18 +01:00
zsilencer bb46510def implement map_can_construct_with_clear_at 2015-07-24 20:52:14 -06:00
IntelOrca 04dcca5468 implement peep_on_enter_or_exit_ride 2015-07-25 02:58:38 +01:00
IntelOrca 50187adc37 enable debug configuration and add optimisations to release configuration 2015-07-24 23:48:23 +01:00
IntelOrca fe69ad6d53 fix day / night cycle for title sequence 2015-07-24 23:05:31 +01:00
IntelOrca 08504257ad fix saving of day night config 2015-07-24 23:00:24 +01:00
IntelOrca 5f69e6f37a add cycle day / night 2015-07-24 22:58:41 +01:00
IntelOrca dd107ee25c save object selection filter, closes #1599 2015-07-24 20:15:13 +01:00
IntelOrca b12b1b5faf support map scroll keyboard shortcuts, e.g. WASD. Closes #757 2015-07-24 19:20:24 +01:00
Duncan e5aeb8dc38 Merge pull request #1668 from janisozaur/develop 
sub_0x68615B doesn't really take any params
 2015-07-24 12:36:58 +01:00