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

2292 Commits

Author SHA1 Message Date
IntelOrca fddeda3021 fix loading of RCT1 (no expansion packs) SC4 files in editor, fixes #687 2015-01-20 01:05:06 +00:00
Ted John 95aaf334dc Merge pull request #709 from duncanspumpkin/fix_ride_locate 
Fix ride bugs and height markers
 2015-01-19 19:47:10 +00:00
Duncan Frost c118b77477 Add notes about obsolete addresses 2015-01-19 18:52:25 +00:00
Duncan Frost 4e917de6cc Fix height markers. 2015-01-19 18:13:25 +00:00
Duncan Frost e9005027a5 Fix #706 right click incorrectly using mouse x,y instead of tile 2015-01-19 17:58:01 +00:00
Duncan Frost e7a0b31884 Ride locate now uses standard scroll_to_viewport.Fix #705 2015-01-19 17:24:39 +00:00
Ted John 1e911a28fd Merge pull request #707 from duncanspumpkin/fix_intro 
Fix intro
 2015-01-18 21:09:14 +00:00
Duncan Frost efad54f1c6 Fix arg_parse accessing invalid memory due to mistake in setup code. Reintroduced free memory of command line parameters 2015-01-18 20:56:08 +00:00
Duncan Frost e6f966f395 Fix intro crash. Caused by incorrect pointer address. Fixed crash on freeing unallocated memory. Fixed audio issue when channels set to zero. 2015-01-18 19:13:21 +00:00
IntelOrca 1ece6e4a70 Merge branch 'master' into develop 2015-01-17 20:40:31 +00:00
IntelOrca c88cde8472 fix vehicle type dropdown in ride window and 0% rating modifiers, fixes #696, fixes #699 2015-01-17 19:13:05 +00:00
Ted John 78d90fd8aa Merge pull request #692 from duncanspumpkin/fix_dropdown 
Fix dropdown location at sides of the screen
 2015-01-17 13:52:46 +00:00
Duncan Frost 7e2da48717 Fix #691. Relocate windows on a resize of the window 2015-01-17 09:55:27 +00:00
Duncan Frost e2b2c94ca1 Fix dropdown location at sides of the screen #690 2015-01-17 09:14:17 +00:00
Ted John 85d1537a6f Merge pull request #533 from mrtnptrs/Dutch_translation_improvements 
Dutch translation improvements
 2015-01-15 11:48:44 +00:00
IntelOrca 0ff125b9b3 move across useful map functions and other bits from footpath branch to develop 2015-01-14 23:38:48 +00:00
IntelOrca 220c2d3fc9 fix #685, peep falling code was not masking tile type 2015-01-13 17:31:33 +00:00
Ted John c5544b52f1 Merge pull request #683 from duncanspumpkin/top_toolbar 
Top toolbar tool down
 2015-01-12 19:27:44 +00:00
Duncan Frost 11be3cd5bd Removed finance button when in no money mode 2015-01-12 18:57:03 +00:00
Duncan Frost 974ecd904c Finish game command 20 change surface style 2015-01-12 18:39:53 +00:00
Duncan Frost 8a4e12a3f4 Started game_command_20 raise lower land 2015-01-12 18:39:52 +00:00
Duncan Frost 42383cc192 Finished tool_down. 2015-01-12 18:39:51 +00:00
IntelOrca f4e0f59355 fix #606, track names in track select window writing one byte out 2015-01-12 18:30:50 +00:00
Ted John 295b08e0fd Merge pull request #660 from eezstreet/develop 
Added 'financial options' button in toolbar, similar to RCT1
 2015-01-12 12:55:51 +00:00
Ted John 0792148cba Merge pull request #680 from duncanspumpkin/fix_editor_flags 
Fix Editor
 2015-01-10 16:27:53 +00:00
Duncan Frost 4346f8c993 Fix issues due to comparing no money flag instead of 18 2015-01-10 14:15:48 +00:00
Ted John 5859af1d1b Merge pull request #679 from duncanspumpkin/fix_editor 
Fix editor object crash
 2015-01-10 13:03:19 +00:00
Duncan Frost e2b690b396 Fix crash when entering object selection 2015-01-10 12:26:48 +00:00
IntelOrca 8b0913b045 Merge branch 'master' into develop 2015-01-08 18:01:57 +00:00
Ted John 0be7814c08 Merge pull request #640 from hostbrute/patch-1 
Update dutch.txt
 2015-01-08 18:00:32 +00:00
Ted John a0c6eecf41 Merge pull request #552 from fbourigault/french-language 
French translation
 2015-01-08 18:00:04 +00:00
Ted John 6ee26261a9 Merge pull request #678 from duncanspumpkin/bottom_toolbar 
Fix spelling mistake
 2015-01-08 17:41:19 +00:00
Duncan 3603b5773e fix spelling mistake. 2015-01-08 12:17:18 +00:00
Ted John c27b2e13b0 Merge pull request #677 from duncanspumpkin/bottom_toolbar 
Bottom Toolbar Functions
 2015-01-07 23:44:13 +00:00
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