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

4297 Commits

Author SHA1 Message Date
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
IntelOrca 36aacdf455 fix freeing of stack memory 2015-08-05 02:22:17 +01:00
IntelOrca cec486839c add 'no entrance' style and refactor a few things 2015-08-05 01:24:18 +01:00
IntelOrca 84f76d81e8 refactor peep 2015-08-05 00:14:07 +01:00
Ted John 166a6638d9 Merge pull request #1728 from janisozaur/portability 
portability fixes
 2015-08-04 23:57:16 +01:00
Michał Janiszewski 413805f675 portability fixes 2015-08-04 22:46:32 +02:00
IntelOrca be4ee45d66 convert more platform functions over to utf8 and close #1713 2015-08-04 21:41:45 +01:00
IntelOrca e0769800e7 remove old zero clearance tool 2015-08-04 20:25:24 +01:00
Ted John f4b530db70 Merge pull request #1726 from janisozaur/portability 
Portability fixes
 2015-08-04 18:47:47 +01:00
Michał Janiszewski 7afb7e2dfd Portability fixes 2015-08-04 19:31:21 +02:00
Ted John 61c42fc653 Merge pull request #1725 from danidoedel/bugfix 
fix recent messages toolbar tooltip
 2015-08-04 17:46:50 +01:00
IntelOrca 9ec701345f fix #1724 2015-08-04 17:40:02 +01:00
danidoedel 1fc7c0ecac fix recent messages toolbar tooltip 2015-08-04 17:56:12 +02:00
IntelOrca 2419c6629e improve clear scenery tool 2015-08-04 16:01:31 +01:00
IntelOrca b5237e24ec improve #1703 2015-08-04 15:21:12 +01:00
IntelOrca ca0e63f1a1 fix #1598 2015-08-04 02:28:05 +01:00
IntelOrca f25ab8e9f3 fix #1715 2015-08-04 02:12:17 +01:00
IntelOrca 59e710f806 fix #1709 2015-08-04 02:08:39 +01:00
IntelOrca cac0f2ab52 upgrade to VS2015 compiler 2015-08-03 23:16:30 +01:00
IntelOrca 36b579ad66 Merge branch 'utf8' into develop 2015-08-03 23:16:04 +01:00
IntelOrca 36c5179b39 implement utf8, part 27 (tweak tooltips) 2015-08-03 18:40:16 +01:00
IntelOrca 3c1190e11f implement utf8, part 26 (bug fixes) 2015-08-03 18:06:54 +01:00
IntelOrca 33929d3ac4 implement utf8, part 25 (bug fixes) 2015-08-03 14:42:48 +01:00
IntelOrca 7bcb12503a implement utf8, part 24 (bug fixes) 2015-08-02 11:25:26 +01:00