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

3858 Commits

Author SHA1 Message Date
IntelOrca 97e4a4d663 add track block and possible ride configuration tables 2015-06-27 22:53:52 +01:00
IntelOrca 457e7862b3 prepare track place and remove game commands 2015-06-27 17:53:28 +01:00
Michael Steenbeek a4322cb855 Fix observation tower and launched freefall descriptions 2015-06-27 16:25:42 +02:00
IntelOrca d45cf519e3 fix warnings 2015-06-27 15:21:32 +01:00
Ted John 19d3529028 Merge pull request #1494 from OpenRCT2/ride-construction-window-2 
Implement ride construction window
 2015-06-27 15:19:31 +01:00
IntelOrca 57fd914a52 implement ride construction 2015-06-27 15:17:54 +01:00
Ted John dd95353878 Merge pull request #1499 from Gymnasiast/object-list-columns-improvements 
Fix double track names in list; use track categories when in select-by-track-type-mode
 2015-06-27 12:53:39 +01:00
Gymnasiast 2ac872dd56 Drop duplicate track names in list; use track categories when in select-by-track-type-mode 2015-06-27 13:08:29 +02:00
Duncan Frost a8a8385899 Fix memory not being freed. 
This was breaking the installed object list creation as it would quickly run out of rct2 memory. Scenario text was incorrectly using rct2_free this has also been fixed.
 2015-06-27 10:30:33 +01:00
Duncan 2c58910f62 Merge pull request #1485 from OpenRCT2/object-selection-columns 
Object selection columns
 2015-06-27 09:16:57 +01:00
Ted John c00df00801 Merge Localisation/master into OpenRCT2/develop. 2015-06-27 04:00:15 +01:00
Ted John d9adf21434 Merge pull request #1492 from duncanspumpkin/object 
Implemented object unload.
 2015-06-26 20:08:54 +01:00
Duncan Frost ab7e1da84e Implemented object unload. 
Refactored calls to the function. No need to pass the object type.
 2015-06-26 17:45:38 +01:00
Ted John 21e262b1c4 Merge pull request #1489 from trigger-death/decompile-1 
Decompiled top_toolbar tool events
 2015-06-26 17:15:03 +01:00
Robert Jordan c20b60652c Removed printfs 2015-06-26 11:47:03 -04:00
Maikel Stuivenberg 18008c2cc6 remove unneeded string 2015-06-26 17:44:17 +02:00
Robert Jordan 9ad21599a3 Decompiled top_toolbar tool events 
Also fixed bug with land rights tool gridlines
 2015-06-26 11:40:37 -04:00
Maikel Stuivenberg 1f5fd4fe67 Reorder shortcut 2015-06-26 17:26:29 +02:00
Maikel Stuivenberg d74885cc18 show/hide UI #1402 2015-06-26 17:01:50 +02:00
Ted John 7527a74d7d Merge Localisation/master into OpenRCT2/develop. 2015-06-26 04:00:19 +01:00
IntelOrca 2e47f2a26a object-selection-columns: finish sorting and add ride tab animations 2015-06-26 01:11:24 +01:00
Maikel Stuivenberg 831bc6b3bd Added a back button on "Select Design" list #1346 2015-06-26 01:21:35 +02:00
IntelOrca 210ba2a04d object-selection-columns: add ride type with sort 2015-06-25 23:35:18 +01:00
Ted John a22d7837ce Merge pull request #1477 from ThomasdenH/wine-date-fix 
Change stat usage to GetFileAttributesEx
 2015-06-25 23:33:08 +01:00
Ted John 96c61dcba5 Merge pull request #1482 from duncanspumpkin/sub_6847BA 
Implemented set_vehicle_type_image_max_sizes
 2015-06-25 23:32:38 +01:00
Ted John 1e2ee5bf7e Merge pull request #1483 from trigger-death/themes-fix-3 
Fixed theme features on duplication
 2015-06-25 23:32:30 +01:00
Ted John dcfbf73435 Merge pull request #1484 from trigger-death/gymnasiast-fix 
Fixed incorrect filter data
 2015-06-25 23:31:50 +01:00
Robert Jordan 760f0853ea Fixed incorrect filter data 2015-06-25 18:15:25 -04:00
Robert Jordan a05ad7319e Fixed themes features duplicate bug 2015-06-25 16:42:12 -04:00
Duncan d11b8bc8fa Merge pull request #1478 from trigger-death/develop 
Added Get button to command editor
 2015-06-25 21:30:04 +01:00
Duncan 9f5abc8efd Merge pull request #1480 from Gymnasiast/patch-3 
Correct typos and American English
 2015-06-25 21:28:17 +01:00
Duncan Frost 132236f9c8 Tidied up function and labelled. 
Unsure when this information is used so not completely convinced this has been done correct.
 2015-06-25 21:06:50 +01:00
Michael Steenbeek a1c3de02b3 Correct typos and American English 2015-06-25 21:56:56 +02:00
Robert Jordan 31e8e604fe Added Get button to command editor 2015-06-25 14:27:09 -04:00
Thomas 4b0c84ed20 Change stat usage to GetFileAttributesEx 2015-06-25 19:46:48 +02:00
Duncan Frost 18879e48eb Start implmenting sub_6847BA. 
Possibly finds drawing center for vehicle?
 2015-06-25 18:12:21 +01:00
Duncan 78104bc562 Merge pull request #1475 from trigger-death/develop 
Title Sequence Editor Improvements
 2015-06-25 18:00:06 +01:00
Robert Jordan 92a31a0fd7 Changed strings 2015-06-25 12:27:57 -04:00
Robert Jordan e255310abf Fixed merge conflicts in english_uk 2015-06-25 11:22:11 -04:00
Robert Jordan 5645d8bd8a Added Game Speed command 2015-06-25 11:19:23 -04:00
Ted John a0f3438538 Merge pull request #1469 from Gymnasiast/fix-remove-all-guests 
Fix remove all guests cheat, improve select by track type, fixes #1462, fixes #1388
 2015-06-25 16:12:15 +01:00
Robert Jordan 937b887a91 Title Sequence Editor Improvements 2015-06-25 10:41:40 -04:00
Michael Steenbeek 060a00c293 Merge pull request #3 from Gymnasiast/select_by_track_type_nicer 
Fix typos
 2015-06-25 14:46:10 +02:00
Gymnasiast 770bfa2721 Another typo 2015-06-25 14:45:33 +02:00
Gymnasiast 8ec3f60f2e Typo 2015-06-25 14:40:46 +02:00
Duncan 2086703d23 Merge pull request #1468 from PFCKrutonium/develop 
Corrected tracks not having file extensions
 2015-06-25 12:27:25 +01:00
Michael Steenbeek e66ba829e1 Update tooltip 2015-06-25 12:19:38 +02:00
Michael Steenbeek 4a4c801ae9 Merge pull request #2 from Gymnasiast/select_by_track_type_nicer 
Don't modify flags when in select_by_track_type mode; make it switchable in-game again.
 2015-06-25 11:48:04 +02:00
Gymnasiast ca1b88fc53 Don't modify flags when in select_by_track_type mode; make it switchable in-game again. 2015-06-25 11:46:17 +02:00
Gymnasiast 6fade38d36 Fix remove all guests cheat 2015-06-25 07:57:18 +02:00