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

2735 Commits

Author SHA1 Message Date
Duncan Frost 3fa3f6b4b1 Added in HACK comments for future reference 2015-02-28 15:52:47 +00:00
IntelOrca 21a53841b5 Merge Localisation/master into OpenRCT2/develop. 2015-02-28 14:47:20 +00:00
Duncan Frost daf0b4e1b1 Fix formating of input.c. Added bring to front on scroll to mask #784 2015-02-28 13:53:30 +00:00
Gericom b560638e23 More refactoring and fixed bug in create_duck 2015-02-28 14:48:04 +01:00
Duncan Frost c30dda131d Fix scrolling when on small map sizes. 2015-02-28 12:27:43 +00:00
Gericom 961a251dd0 Added rct_balloon and rct_duck structs 2015-02-28 11:47:09 +01:00
Ted John ef5e61a7aa Merge pull request #884 from duncanspumpkin/fix_editor 
Fix editor
 2015-02-28 00:39:25 +00:00
Duncan Frost 2b2ca7c7b3 Fix zoomed saves incorrectly loading 2015-02-28 00:20:34 +00:00
Ted John a432c62684 Merge pull request #883 from adrian17/window-scrolling 
Don't scroll the window if it lost keyboard focus
 2015-02-27 23:47:49 +00:00
Duncan Frost f8a334c90f Fix memory corruption when saving. 2015-02-27 23:42:51 +00:00
Adrian Wielgosik 29c30cb8f8 Don't scroll the window if it lost keyboard focus 2015-02-28 00:32:56 +01:00
Ted John 4942a40088 Merge pull request #882 from duncanspumpkin/fix_cursor 
Fix cursor
 2015-02-27 23:24:40 +00:00
Duncan Frost cf5f2e0ae4 Fix cursor not changing when switching between scenery and other windows 2015-02-27 23:00:29 +00:00
IntelOrca 4268c930e8 fix shortcuts, fixes #824, fixes #512... 
- add saving of shortcut configuration
- allow setting of shortcuts in title screen
 2015-02-27 17:29:23 +00:00
Gericom ff79e98819 Implemented a couple of functions, memory leak fix 
- create_duck
- viewport_set_underground_flag (0x006E7A15)
Free dpi in paint_park_entrance_entry
 2015-02-27 16:34:52 +01:00
Ted John b8f81b2c29 Merge pull request #880 from duncanspumpkin/track_save 
Save Track Design
 2015-02-27 14:24:00 +00:00
Duncan Frost 4c527225fb Refactor. Now uses same code for scenery_tracks and just tracks 2015-02-27 13:04:48 +00:00
Duncan Frost ca653aed63 Implemented go into scenery select mode 2015-02-27 13:04:46 +00:00
Duncan Frost b72ffb43db Finish track_save_scenery. Design cancel now called after save 2015-02-27 13:04:45 +00:00
Duncan Frost 189d5d2f08 Add more to the ride track save 2015-02-27 13:04:44 +00:00
Duncan Frost 054d91f0ce Started implementing track_save 2015-02-27 13:04:43 +00:00
Gericom 4157ddc065 Merge remote-tracking branch 'upstream/develop' into develop 2015-02-27 13:40:15 +01:00
Gericom 69545bfbd9 Implemented create_balloon 2015-02-27 13:29:57 +01:00
Ted John b89af82f07 Merge pull request #876 from Gericom/develop 
Implemented paint_ride_entry and cleanup,  Implemented window_construction_paint
 2015-02-27 12:11:53 +00:00
Gericom baaacfedd3 Revert disabling platform_lock_single_instance 2015-02-27 12:54:42 +01:00
Gericom cb3ea8317c Merge pull request #3 from Gericom/window_construction_paint 
Implemented window_construction_paint
 2015-02-27 12:51:21 +01:00
Gericom a64e89ec66 Refactoring window_construction_paint, fixed bugs 2015-02-27 12:49:22 +01:00
Ted John 09ab865630 Merge pull request #879 from Gymnasiast/develop 
Make the (up) and (new file) strings in the load/save dialog translatable
 2015-02-27 11:23:43 +00:00
Michael Steenbeek 60a49aad77 Make (up) and (new file) strings translatable 2015-02-27 10:48:29 +01:00
Michael Steenbeek 81527037d4 Make (up) and (new file) strings translatable 2015-02-27 10:47:01 +01:00
Michael Steenbeek d6d71e6fe6 Make (up) and (new file) strings translatable 2015-02-27 10:46:12 +01:00
Michael Steenbeek baebedad4f Merge pull request #1 from IntelOrca/develop 
Fast forward
 2015-02-27 10:39:16 +01:00
Gericom 00dcd4fba8 Implemented window_construction_paint 
Still contains some bug related to drawing the current track piece
 2015-02-27 10:37:17 +01:00
Gericom 30364c5662 Merge pull request #1 from duncanspumpkin/refactor 
Refactor sub_6A9DE1. Now uses known structures.
 2015-02-26 19:46:09 +01:00
Duncan Frost 4905e85cd9 Refactor sub_6A9DE1. Now uses known structures. 2015-02-26 18:42:25 +00:00
Gericom ac2415a949 More cleaning up for paint_*_entry functions 2015-02-26 15:58:13 +01:00
Gericom ec3e7edcec Implemented paint_ride_entry 
Translated ride names and descriptions! (only the names in the scenario
editor are still in english somehow)
 2015-02-26 14:47:34 +01:00
Ted John 3ef1716616 Merge pull request #875 from duncanspumpkin/fix_871 
Fix transparent fences
 2015-02-25 21:27:09 +00:00
Duncan Frost e5bc7e8998 Fix transparent fences 2015-02-25 21:21:08 +00:00
IntelOrca ba2246dd8c Merge Localisation/master into OpenRCT2/develop. 2015-02-25 20:56:17 +00:00
IntelOrca 3c6e136b02 fix marketing campaign ride dropdown again, #874 2015-02-25 19:38:43 +00:00
IntelOrca d79bb68bfa fix marketing campaign ride dropdown, #874 2015-02-25 19:04:46 +00:00
IntelOrca ae69718b53 refactor ride_construct, fixes #725 2015-02-25 18:26:37 +00:00
IntelOrca b53c828ae4 add nicer string for new scenarios default name, fixes #864 2015-02-25 18:08:25 +00:00
IntelOrca 3da2275b5e add missing breaks, fixes #838 2015-02-25 17:53:50 +00:00
IntelOrca 3e75e82d93 update audio device list, #594 2015-02-25 17:47:11 +00:00
Ted John d5cd4e3187 Merge pull request #870 from Gericom/develop 
Object related stuff and better dutch translation
 2015-02-25 15:25:25 +00:00
Gericom fb84fd785d Implemented paint_park_entrance_entry 2015-02-25 15:52:19 +01:00
Gericom b070ffa08f Reverted old dutch language file, more object stuff 
Implemented paint_water_entry
 2015-02-25 15:24:01 +01:00
Gericom ac6fa31292 Object related stuff and better dutch translation 
Implemented: paint_path_entry
Implemented: paint_stex_entry
-> Scenarios texts are now shown correctly localized
Better dutch translation based on the original dutch rct2
 2015-02-25 15:06:29 +01:00