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

2465 Commits

Author SHA1 Message Date
Duncan Frost 495e60a5a7 Labeled peep->sub_state and rejiged next_z 2015-01-24 19:48:15 +00:00
Ted John a14f686e21 Merge pull request #721 from duncanspumpkin/fix_ride_connected 
Fix ride connected messages
 2015-01-24 19:41:52 +00:00
Duncan Frost f5034cee0b Fix ride connenected issue 2015-01-24 19:32:07 +00:00
IntelOrca dfb1f055b9 implement game_command_set_current_loan 2015-01-24 19:07:35 +00:00
IntelOrca 475c98c540 implement game_command_set_research_funding 2015-01-24 18:41:55 +00:00
IntelOrca eec7e2e458 implement marketing_start_campaign 2015-01-24 18:22:06 +00:00
Ted John 84e1d2cdf8 Merge pull request #715 from IntelOrca/refactor-map-element-iteration 
Refactor map element iteration
 2015-01-24 17:43:54 +00:00
IntelOrca 80959b7db7 fix fullscreen mode saving 2015-01-24 15:06:14 +00:00
IntelOrca 5e074a61e6 fix fullscreen issues 2015-01-24 13:16:35 +00:00
IntelOrca 7cdcb6402e fix fullscreen resolution, fixes #89 2015-01-23 20:47:33 +00:00
Ted John a7a89fcf0f Merge pull request #712 from duncanspumpkin/ebp_unsafe 
Fix bug in track design, EBPSAFE reworked
 2015-01-23 00:00:45 +00:00
Duncan Frost 007817f967 Fix bug in vehicle dropdown. Refactor track more 2015-01-22 21:08:45 +00:00
Duncan Frost 4a6b6475fd Fixed track_place crash #713. 2015-01-22 21:05:52 +00:00
Duncan Frost dd97974741 Refactored track_load 2015-01-22 21:04:53 +00:00
Duncan Frost a57bf368bb Reworked EBPSAFE. Removed EBPSAFE_X. Fixed track list bug #606. 2015-01-22 21:01:57 +00:00
IntelOrca 164cf20ea4 use map iterator for calculate_park_size 2015-01-22 17:31:58 +00:00
IntelOrca 8774731f03 refactor map element iteration 2015-01-22 00:19:05 +00:00
IntelOrca 658d949733 add RCT1 SC6/SV6 data structure 2015-01-21 15:54:33 +00:00
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 3a8f85b7d2 implement footpath remove and create, bugs exist 2015-01-14 23:51:59 +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