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

4620 Commits

Author SHA1 Message Date
Gymnasiast fd715c7c5d Name RIDE_TYPE_FLAG_8 and _12 2015-08-12 00:21:53 +02:00
Duncan 82ed4a9794 Merge pull request #1767 from Gymnasiast/land-water-rights-window-refactor 
Refactor land, water and land rights windows
 2015-08-11 22:17:21 +01:00
Gymnasiast 7fe0284917 Refactor land, water and land rights windows 2015-08-11 23:09:39 +02:00
Ted John a0f0765879 Merge pull request #1765 from rd3k/patch-1 
Add rd3k to contributors
 2015-08-11 18:42:57 +01:00
Ted John 4a7147c9ae Merge pull request #1764 from Gymnasiast/fix-clear-scenery-in-scenario-editor 
Fix Clear Scenery tool in Scenario Editor, fixes #1763
 2015-08-11 18:42:39 +01:00
Ted John b6198ab699 Merge pull request #1766 from Gymnasiast/refactor-extend-clear-scenery 
Refactor Clear Scenery window and raise size limit to 64
 2015-08-11 18:42:15 +01:00
Gymnasiast 23d4084332 Refactor Clear Scenery window and raise size limit to 64 2015-08-11 18:26:39 +02:00
James 77994a80d9 Add rd3k to contributors 2015-08-11 17:01:52 +01:00
Gymnasiast 810bd0620a Fix Clear Scenery tool in Scenario Editor 2015-08-11 17:54:21 +02:00
Ted John 9fd791c89d Create CONTRIBUTING.md 2015-08-11 13:57:31 +01:00
Ted John 636f8fb9bc Merge pull request #1760 from medsouz/audiofocus 
Disable audio when tabbing out
 2015-08-11 13:20:27 +01:00
medsouz e0e9dedb8b Moved strings to english_uk.txt 2015-08-11 07:30:29 -04:00
medsouz 58aeb6c911 Changed the wrong boolean 
I should probably sleep more...
 2015-08-11 07:17:06 -04:00
medsouz db9ea4cdf3 Added toggle for audio disable on focus lost 
This closes #1758
 2015-08-11 07:06:00 -04:00
medsouz 6caa48d3c3 Make all game sounds respect gGameSoundsOff 2015-08-11 06:29:21 -04:00
medsouz 3ce6d7020b Pause audio when tabbing out 
TODO: Figure out why title music and toilet sounds are still playing

Add an option to disable this feature so that people can jam out to the
carousel music while tabbed out.
 2015-08-11 00:42:18 -04:00
Ted John 4ee464fb1b Merge pull request #1759 from medsouz/scrolloverflow 
Fix scrollbar integer overflow when scrolling up or left.
 2015-08-10 23:50:37 +01:00
medsouz 72f3d1ace3 Fix scrollbar integer overflow 
Fixes #1752
 2015-08-10 18:15:31 -04:00
Ted John 75f65e9ee4 Merge pull request #1757 from LRFLEW/guestSearch 
Fix #1756
 2015-08-10 18:13:11 +01:00
LRFLEW b2bb862f75 Fix #1756 2015-08-10 11:01:35 -05:00
Ted John 6f166a7b11 Merge pull request #1755 from Gymnasiast/linux-optimisations 
Enable optimisations in Linux build
 2015-08-10 12:32:47 +01:00
IntelOrca b7f037fe60 use TTFFontSimSun for Chinese (Simplified) and fix config value reading 2015-08-10 12:31:39 +01:00
Gymnasiast de3f558f49 Enable optimisations in Linux build 2015-08-10 13:25:26 +02:00
IntelOrca 9f96b87af2 Merge branch 'LRFLEW-guestSearch' into develop 2015-08-10 11:57:27 +01:00
LRFLEW d10f5c8f06 Added tracked guests filter 2015-08-09 22:58:15 -05:00
Ted John 7395752ddf Merge Localisation/master into OpenRCT2/develop. 2015-08-10 04:00:15 +01:00
Ted John 3bc58b7d7f Merge pull request #1751 from Gymnasiast/extra-languages 
Add Simplified Chinese and Finnish as selectable languages
 2015-08-09 23:17:52 +01:00
Gymnasiast 959b492330 Add Simplified Chinese and Finnish as selectable languages 2015-08-09 21:29:42 +02:00
Ted John 5ae099c062 Merge Localisation/master into OpenRCT2/develop. 2015-08-08 04:00:15 +01:00
Ted John 886b07f83c Merge pull request #1745 from Gymnasiast/invention-comment 
Add comment to clarify that non-inventioned rides are skipped
 2015-08-07 22:01:34 +01:00
Gymnasiast 46a0529f40 Add comment to clarify that non-inventioned rides are skipped 2015-08-07 22:34:15 +02:00
Ted John 2a9698c7c2 Merge Localisation/master into OpenRCT2/develop. 2015-08-07 04:00:14 +01:00
IntelOrca f43c7f6ac1 implement viewport_vehicle_paint_setup 2015-08-07 02:47:57 +01:00
IntelOrca 5e804463c8 fix #1740 2015-08-07 02:04:44 +01:00
Ted John 8f3e7e5cd0 Merge pull request #1741 from janisozaur/memory 
Prevent accessing memory we don't own
 2015-08-06 23:56:18 +01:00
Michał Janiszewski fd6ddb7120 Prevent accessing memory we don't own 
In case where strlen(propertyName) < strlen(name) we are accessing
memory from stack mapping possibly outside our ownership.

Prevent such behaviour by clamping the check to valid range only.
 2015-08-07 00:42:51 +02:00
Ted John b081f27a92 Merge Localisation/master into OpenRCT2/develop. 2015-08-06 04:00:15 +01:00
IntelOrca d0827bd9d8 implement window_maze_construction_resize and window_maze_construction_construct 2015-08-06 02:12:36 +01:00
IntelOrca 4f77cc8df3 implement gfx_draw_sprite_raw_masked 2015-08-06 01:00:03 +01:00
Ted John 63e7bb5720 Merge pull request #1737 from janisozaur/travis 
travis fixes
 2015-08-05 22:44:14 +01:00
Michał Janiszewski 189c6bb0ee travis fixes 2015-08-05 23:25:49 +02:00
IntelOrca cb3abcb0ca fix #1612 2015-08-05 21:49:44 +01:00
IntelOrca 1496f2404d fix #1736 2015-08-05 21:36:58 +01:00
Maikel Stuivenberg d12b75acc2 hide non-applicable marketing campaigns, closes #1516, closes #1454, fixes #1510 2015-08-05 21:18:56 +01:00
IntelOrca 6b72f9a555 refactor shop item strings 2015-08-05 19:17:37 +01:00
IntelOrca 19f94b54e1 fix #1669 2015-08-05 13:44:47 +01:00
IntelOrca a3ff453f40 fix #1667 2015-08-05 13:36:46 +01:00
IntelOrca 2d770093e9 fix #1630 2015-08-05 13:01:41 +01:00
Ted John 6308e8ee0f Merge pull request #1732 from PFCKrutonium/patch-2 
Updated VS Version
 2015-08-05 12:11:21 +01:00
Krutonium 4a2731092a Updated VS Version 
And also updated the link to the community edition. As of 2015, Express no longer exists and has been replaced with Community.
 2015-08-05 03:36:17 -04:00