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

2358 Commits

Author SHA1 Message Date
Duncan Frost 1fed6ac32c Added missing btm toolbar functions. Added dirty enum 2015-01-07 20:25:48 +00:00
Ted John 7844c54e14 Merge pull request #674 from duncanspumpkin/fix_dirty_money 
Fix dirty money flag.
 2015-01-05 20:15:14 +00:00
Duncan Frost 4da2521967 Fix dirty money flag. 2015-01-05 18:48:55 +00:00
IntelOrca 30a953434d Merge branch 'master' into develop 2015-01-05 12:38:07 +00:00
Ted John 67931aeabe Merge pull request #531 from mrtnptrs/Remove_dashes_after_the_colon 
Remove dashes after the colon at every language file
 2015-01-05 12:23:42 +00:00
Ted John 58ebd40901 Merge pull request #643 from Gymnasiast/patch-4 
Add missing Dutch invention list strings
 2015-01-05 00:38:19 +00:00
Ted John 2b267a861b Merge pull request #673 from duncanspumpkin/text_input_unknown_7 
Fix #672
 2015-01-04 17:25:30 +00:00
Duncan Frost ef72f66fa7 Moved text_input update to unknown7 function in order to force updates when paused. 2015-01-04 17:00:36 +00:00
Ted John 72636b2bb1 Merge pull request #671 from duncanspumpkin/fix_ride_items_count 
Fixed secondary item count
 2015-01-04 16:38:11 +00:00
Duncan Frost 8cd6d51cea Fixed secondary item count. Labeled count offsets 2015-01-04 16:28:19 +00:00
Ted John f06a7f3fe6 Merge pull request #666 from duncanspumpkin/More_rain 
Increased the number of rain pixels to max
 2015-01-02 15:17:57 +00:00
Duncan Frost 9f267fe669 Increased the number of rain pixels to max 2015-01-02 10:16:05 +00:00
Ted John 592e6bdd45 Merge pull request #662 from duncanspumpkin/fix_pause_sound 
Fixed #659
 2015-01-01 14:31:25 +00:00
Ted John 9a3a99316d Merge pull request #661 from Tinytimrob/develop 
Strings in UK language file are wrong
 2015-01-01 14:29:59 +00:00
Ted John 9974ab7420 Merge pull request #665 from Gymnasiast/patch-5 
Add missing handyman strings
 2015-01-01 14:27:52 +00:00
Gymnasiast 4f9b8ea43a Add missing handyman strings 2015-01-01 13:57:38 +01:00
eezstreet 68ada3d06b Added financial options tab to main toolbar 2014-12-31 23:28:50 -05:00
Ted John d022c859fc Merge pull request #664 from duncanspumpkin/fix_gloom 
Fix gloom
 2014-12-31 19:00:13 +00:00
Duncan Frost 8b86ded534 Fix gloom at increased zoom levels. 2014-12-31 18:42:03 +00:00
Duncan Frost cfd83eca1d Fix rain gloom. Mistake in viewport_paint caused no change in gloom 2014-12-31 18:13:58 +00:00
Duncan Frost 4257d0bcc4 Labelled offset to redundant max vehicle sounds. 2014-12-31 15:04:20 +00:00
Duncan Frost cbe49300b8 Fixed sounds not playing properly when paused. Labeled max sounds offset. Prevented crash on null dereference 2014-12-31 14:54:23 +00:00
Robert James Dennington 7fda6d4866 Update english_uk.txt 
Corrected some strings to match UK release
 2014-12-31 14:38:12 +00:00
Ted John 46bf391989 Merge pull request #657 from duncanspumpkin/drawing_f 
Fixed drawing issues when zoomed.
 2014-12-28 13:42:41 +00:00
Duncan Frost c3c8a73225 Fixed drawing issues when zoomed. 2014-12-28 13:29:26 +00:00
Ted John fde30fb2f2 Merge pull request #655 from atmaxinger/develop 
Update German translation of cheat window
 2014-12-27 00:24:13 +00:00
atmaxinger ccac7dfa1a Update German translation of cheat window 2014-12-26 17:37:27 +01:00
Ted John c6395c1b39 Merge pull request #653 from duncanspumpkin/keypad_input 
Remapped keypad enter to return keycode.
 2014-12-22 20:54:17 +00:00
Duncan Frost f6cb4a0064 Remapped keypad enter to return keycode. 2014-12-22 20:29:36 +00:00
Ted John 7b8dc291a5 Merge pull request #650 from duncanspumpkin/text_input_large 
Added multi line text input
 2014-12-22 19:35:50 +00:00
Duncan Frost 153196a905 Remove redundant define 2014-12-22 16:55:17 +00:00
Duncan Frost ba93cd337b Added dynamic window resizing on change of text. Fixed cursor display issue 2014-12-22 16:50:35 +00:00
Duncan Frost f93aeb33c6 Added multi line text input 2014-12-22 10:40:00 +00:00
Ted John d53085c7d6 Merge pull request #649 from duncanspumpkin/ride_construct 
Ride construct
 2014-12-20 13:17:36 +00:00
IntelOrca c18cb357fe Merge branch 'adrian17-separate-projects' into develop 2014-12-20 13:15:26 +00:00
IntelOrca 9203bff09e fix output project directories 2014-12-20 13:13:08 +00:00
Duncan Frost acf6ef7b88 Fixed construct bug 2014-12-20 13:06:17 +00:00
IntelOrca d5bdc0ff7f Merge branch 'separate-projects' of https://github.com/adrian17/OpenRCT2 into adrian17-separate-projects 2014-12-20 13:03:57 +00:00
Duncan Frost a96bf872bf Added more of demolish. Fixed bug in window_close 2014-12-20 11:14:26 +00:00
Duncan Frost 749bd48f3d Started adding a little bit of ride construct mouse down 2014-12-20 10:43:30 +00:00
Ted John 71c49a9591 Merge pull request #647 from duncanspumpkin/fix_ride_construct 
Added construct dropdown function fixes #638.
 2014-12-19 22:17:19 +00:00
Duncan Frost 583cb5118c Added construct dropdown function fixes #638. 2014-12-19 18:44:42 +00:00
Ted John 58411f4b86 Merge pull request #645 from mharrys/spellfix-swedish 
Update swedish.txt
 2014-12-18 22:31:44 +00:00
Adrian Wielgosik 448b82b6fa Separate external libraries and language files into VS projects 2014-12-18 22:31:16 +01:00
Mattias Harrysson 80dbecbade s/Gånvägen/Gångvägen 2014-12-18 22:18:59 +01:00
Mattias Harrysson 02720146f3 s/tranporterar/transporterar 2014-12-18 22:13:33 +01:00
Mattias Harrysson 40472c0342 s/acceleras/accelereras 2014-12-18 22:11:53 +01:00
Mattias Harrysson 007a2415af s/spekhastighet/spelhastighet/ 2014-12-18 22:08:43 +01:00
Ted John d062e7d31e Merge pull request #641 from adrian17/viewport_fix 
Fix for sub_6E7F34 in viewport.c
 2014-12-18 13:55:19 +00:00
Adrian Wielgosik 8d65078abf Remove a no longer relevant comment 2014-12-17 23:30:39 +01:00