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

2677 Commits

Author SHA1 Message Date
IntelOrca ac4cd56b63 add new load / save window, closes #580 2015-02-14 02:16:03 +00:00
IntelOrca 97e7a27c17 Merge branch 'footpath-commands' into develop 2015-02-13 20:58:27 +00:00
Ted John 72ff9f3e35 Merge pull request #793 from adrian17/develop 
Fix map window scrollbars not being initialized properly; fixes #478.
 2015-02-13 20:58:20 +00:00
IntelOrca c0e4518972 refactor some of the footpath code after merging 2015-02-13 20:55:49 +00:00
Adrian Wielgosik 35bf40fb39 Fix map window scrollbars not being initialized properly; fixes #478. 2015-02-13 21:39:51 +01:00
IntelOrca 886f30d00c Merge branch 'develop' into footpath-commands 2015-02-13 19:32:13 +00:00
IntelOrca e8e7dfbc70 improve object selection window 2015-02-13 18:43:22 +00:00
Michael Steenbeek eaf66f959e Change string to reflect outcome of discussion 2015-02-13 11:22:22 +01:00
IntelOrca e953fdc360 improve random map generator, change algorithm to simplex noise 2015-02-13 03:29:40 +00:00
Ted John 37b3f86450 Merge pull request #792 from duncanspumpkin/set-ride-status_df 
(Set ride status) Fix relocation bug, Fix ride name
 2015-02-12 22:47:03 +00:00
Duncan Frost a7f4d44ece Add check_for_entrance_exit. Fixed ride name not shown 2015-02-12 22:30:31 +00:00
IntelOrca a66b29076b move osinterface code to shared or windows 2015-02-12 20:51:40 +00:00
Duncan Frost abd8e34f2f Implemented check_valid_stations. Fixed relocation bug 2015-02-12 19:41:09 +00:00
IntelOrca bfb58133e9 remove user project settings from git 2015-02-12 19:04:56 +00:00
Ted John 00a58b7097 Merge pull request #790 from duncanspumpkin/fix_761 
Fix bathrooms missing same price everywhere checkbox
 2015-02-12 19:03:45 +00:00
Ted John 5ea8a77241 Merge pull request #789 from duncanspumpkin/track_rename_delete 
Track rename delete
 2015-02-12 19:03:24 +00:00
Duncan Frost 719e23ec3b Fix bathrooms missing same price everywhere box. Fix #761 2015-02-12 18:58:16 +00:00
Duncan Frost 12cf791254 Fixed track delete. 2015-02-12 18:40:07 +00:00
Duncan Frost 715c8bcf0f Fixed track rename. 2015-02-12 18:35:41 +00:00
IntelOrca 483e983639 allow mouse wheel zooming on viewports, fixes #774 2015-02-11 22:42:54 +00:00
IntelOrca 392ff7bfea remove expansion packs from title sequence, closes #752 2015-02-11 22:18:19 +00:00
IntelOrca 2bbaa0fc4c Merge branch 'object-selection-window' into develop 2015-02-11 21:05:05 +00:00
IntelOrca fadeff9dda fix a few issues with object selection and track manage 2015-02-11 21:03:23 +00:00
Ted John aa9ed87444 Merge pull request #782 from duncanspumpkin/fix_773 
Fix #773
 2015-02-11 20:34:26 +00:00
Ted John 97c341d9a2 Merge pull request #783 from duncanspumpkin/set_ride_status_df 
(Set-ride-status) Fix hang caused by no rideIndex being passed
 2015-02-11 20:33:59 +00:00
Duncan Frost 3436e5133f Fix #773. Issue caused by missing some allocations of the map size. 2015-02-11 20:25:11 +00:00
Duncan Frost 461655f3f6 Fix hang caused by no rideIndex being passed 2015-02-11 19:59:31 +00:00
IntelOrca 74e1c0923f implement window_editor_object_selection_scrollpaint 2015-02-11 19:42:10 +00:00
IntelOrca 51802aac45 fix object order and add object dat name to object selection window, closes #440 2015-02-11 18:54:31 +00:00
IntelOrca 59eff1f572 implement window_editor_object_selection_paint 2015-02-11 17:50:52 +00:00
IntelOrca 9c06699dce implement more events for object selection window 2015-02-11 16:02:57 +00:00
Michael Steenbeek 99abf81ea4 Add Dutch map generation strings 
As added by f6c09b44b6.

@IntelOrca: please wait one day before merging.
 2015-02-11 13:22:19 +01:00
Ted John 9640c33b54 Merge pull request #776 from briaguya/develop 
fixed ride profit calculation
 2015-02-11 01:56:19 +00:00
Brian Smith 91207bb837 fixed ride profit calculation 
looks like there was a cast to money16 that was making it go negative
 2015-02-10 20:50:14 -05:00
IntelOrca a978a931e7 fix issues with random map generator 2015-02-11 00:02:09 +00:00
Ted John 5c6a2bb837 Update changelog.txt 2015-02-10 22:18:49 +00:00
IntelOrca 0db1c88f2b refactor window hold down widgets (var_020) 2015-02-10 20:40:33 +00:00
IntelOrca f6c09b44b6 merge in random map generator 2015-02-10 20:11:59 +00:00
IntelOrca 5b3c1b6764 finalise placing of trees 2015-02-10 19:52:24 +00:00
Ted John c3246fc7a9 Merge pull request #771 from duncanspumpkin/fix_751 
Fix #751
 2015-02-10 19:36:48 +00:00
Duncan Frost 00583d12e6 Fix #751. Main bug caused by doing subtraction before factoring in zoom 2015-02-10 19:13:37 +00:00
IntelOrca 9cc108abbb remove toolbar.c and ignore seperators at the end of the toolbar 2015-02-10 14:41:35 +00:00
Ted John 4b095b65d6 Merge pull request #770 from duncanspumpkin/draw_track_preview 
Draw track preview
 2015-02-09 19:06:48 +00:00
Ted John 6cd0c264b3 Merge pull request #769 from Gymnasiast/patch-2 
Added new strings for units and title screen music
 2015-02-09 19:05:34 +00:00
Duncan Frost b388512c4f Remove hack to pass exapanison check 2015-02-09 19:02:54 +00:00
Michael Steenbeek 9d07a94407 Added new strings for units and title screen music 
Rebase of #767
 2015-02-09 19:56:40 +01:00
Duncan Frost edfbd80747 Added track_data refactored track_place to use track_data 2015-02-09 18:52:01 +00:00
Duncan Frost 5fb09400e7 Fix track name null 2015-02-09 18:52:00 +00:00
Duncan Frost a0775f9ac9 Refactor track_place to use new structs 2015-02-09 18:51:59 +00:00
Duncan Frost bc847628cd Labelled track preview offsets 2015-02-09 18:51:58 +00:00