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

3888 Commits

Author SHA1 Message Date
Maikel Stuivenberg 36b9d8de8a Merge with develop 2015-06-28 21:40:01 +02:00
Maikel Stuivenberg 952cbdebaf move string to id 5453 2015-06-28 21:33:54 +02:00
Maikel Stuivenberg d968a65701 Changed back-button location 2015-06-28 21:30:20 +02:00
Duncan Frost 2c3c8dc188 Fix incorrect pointer maths. Fixes #1511. 2015-06-28 19:46:08 +01:00
IntelOrca ed41c2b995 fix map_reorganise_elements 2015-06-28 18:59:55 +01:00
IntelOrca 3e200d0bd2 implement ride_fix_breakdown 2015-06-28 18:36:46 +01:00
Ted John b1b61e7df5 Merge pull request #1509 from duncanspumpkin/map_functions 
Map functions
 2015-06-28 18:03:53 +01:00
IntelOrca e2a694b96e implement format_string_toupper and litter_create 2015-06-28 17:45:19 +01:00
Duncan Frost 33c4698e06 Implemented map_reorganise_elements. 
Fixed a potential issue that would cause cursors to become stuck.
 2015-06-28 16:50:21 +01:00
IntelOrca b4f8d3b753 add new shortcuts to shortcut window and fix bottom toolbar hiding in editor 2015-06-28 13:59:38 +01:00
Duncan 9b4d375707 Merge pull request #1501 from Gymnasiast/patch-2 
Fix observation tower and launched freefall descriptions
 2015-06-28 13:55:11 +01:00
Duncan b2e4ef0be4 Merge pull request #1508 from danidoedel/patch-4 
Fix window titles (cheats)
 2015-06-28 13:54:12 +01:00
Duncan Frost 8167c24526 Implemented sub_68B044 some sort of check to make sure there is space for new element. 
If there isn't then it will try reorganise the elements to make room.
 2015-06-28 13:53:24 +01:00
danidoedel 06ee0342b7 Fix window titles (cheats) 2015-06-28 14:52:05 +02:00
Ted John 78c8ba09b3 Merge pull request #1490 from MaikelS11/toggle-top-bottom-toolbar 
Toggle top bottom toolbar
 2015-06-28 13:41:16 +01:00
IntelOrca f452b4d39a fix #1506 2015-06-28 13:36:52 +01:00
IntelOrca 48268d50cc implement a couple of ride subroutines and refactor 2015-06-28 13:36:51 +01:00
Duncan Frost 5e3df22414 Implemented map element remove. Small tidy of functions in game.c. 2015-06-28 13:31:46 +01:00
Duncan 1889d49da3 Merge pull request #1507 from ThomasdenH/forced-park-rating 
Add cheat to force park rating
 2015-06-28 13:07:44 +01:00
Thomas e72739dbd6 Add cheat to force park rating 2015-06-28 13:38:38 +02:00
Maikel Stuivenberg 9feff63c6d Remove viewport flag 2015-06-28 13:36:46 +02:00
IntelOrca 36d6ea7a6e fix setting brakes speed on current track and implement game command 2015-06-28 11:44:46 +01:00
IntelOrca b8fa25bcb6 fix brakes speed not being set when building track 2015-06-28 11:44:45 +01:00
Maikel Stuivenberg 4f7fbaaeb7 Merge remote-tracking branch 'upstream/develop' into toggle-top-bottom-toolbar 2015-06-28 12:06:47 +02:00
Michael Steenbeek fb9fe6615b Fix typo 2015-06-28 11:11:07 +02:00
Duncan e2403d5a9b Merge pull request #1503 from Gymnasiast/patch-3 
Add more translators to contributors.md
 2015-06-28 09:08:50 +01:00
Michael Steenbeek ae4340520c Add more translators to contributors.md 2015-06-28 08:20:05 +02:00
Ted John 0a1cd30597 Merge Localisation/master into OpenRCT2/develop. 2015-06-28 04:00:16 +01:00
IntelOrca 63698761fd remove some small callprocs 2015-06-28 01:57:50 +01:00
IntelOrca 2e1c449e91 use TRACK_BLOCK_END instead of random 255 arrays 2015-06-27 22:58:03 +01:00
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