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

1872 Commits

Author SHA1 Message Date
Broxzier 2b87dcf71a Fix crash when moving selected tile with spinners 2016-10-11 23:27:11 +02:00
Broxzier 75326ba0c1 Add toggle for blocked paths - even works when the banner is non-blocking 2016-10-11 23:27:10 +02:00
Broxzier e078c032dd Add banner text info. Fix rotating banners (they are never rotated, but have a position) 2016-10-11 23:27:09 +02:00
Broxzier 5ee1fc294d Use rotation mask instead of modulo operator to get indices 2016-10-11 23:27:08 +02:00
Broxzier 4243545faa Large scenery info 2016-10-11 23:27:07 +02:00
Broxzier 1e4de56baf Clipping strings in list to fit their column 2016-10-11 23:27:06 +02:00
Broxzier 3ac29b20c0 Disables fence slope setting for entries that do not allow sloped fences 
- Replaces places where the first element was requested to use the same function
 2016-10-11 23:27:05 +02:00
Broxzier a68dc7afb8 Add fence and banner info to tile inspector 
This commit also renamed a flag, and corrected the use of one. The
flags in question are WALL_SCENERY_BANNER, WALL_SCENERY_2_FLAG4, and
WALL_SCENERY_2_FLAG5.
 2016-10-11 23:27:04 +02:00
Broxzier 34a7ab5c63 Reordered widget defines 
These defines are used to calculate the edges of the widgets. They are
now ordered in the same way the widgets are listed for the pages.
This commit also adds some extra defines, to make it more easy to tweak
the sizes and padding of widgets.
 2016-10-11 23:27:03 +02:00
Broxzier 0de8b4f1f5 Add dropdown for changing fence slopes 2016-10-11 23:27:02 +02:00
Broxzier 545da27201 Add clamp button for corrupt elements 2016-10-11 23:27:01 +02:00
Broxzier 3eb4d8c182 Add raise/lower for remaining elements, fix sort button not switching page 2016-10-11 23:27:00 +02:00
Broxzier f5423f7586 Entrance details 
@todo: For park entrances, the left and right tile do not show the entrance ID. Will solve this later.
 2016-10-11 23:26:59 +02:00
Broxzier af59bf3c2b Add entrance type detail and raise/lower ability 2016-10-11 23:26:58 +02:00
Broxzier a9654213c9 Improve corrupt element insertion, code formatting 
Corrupt elements are now placed right under the selected element
Local tile-inspector variables now all use camelCaseNames
Removed unused string, and shifted string IDs
 2016-10-11 23:24:43 +02:00
Broxzier 7eb4c72e94 Moved new strings to end of file, and formatting 
strings should be in order, and code formatted was to make it more consistant
 2016-10-11 23:21:43 +02:00
Broxzier 1871f4290a Add raise/lower option for surface and fix clearance height 2016-10-11 23:21:42 +02:00
Broxzier 8707cea1b4 Add surface corner properties 2016-10-11 23:21:41 +02:00
Broxzier 5807291b30 scenery page and some changes to the other pages 2016-10-11 23:21:40 +02:00
Broxzier eeca2eb976 Removes unneeded variables from track block functions 2016-10-11 23:21:39 +02:00
Broxzier 0d48418c5f Add path name to path details 2016-10-11 23:21:38 +02:00
Broxzier e45470ad89 Fix 'RCT2_GLOBAL undefined' build error 2016-10-11 23:21:37 +02:00
Broxzier dbe5ad1bb1 Fix 'type defaults' build error 2016-10-11 23:21:36 +02:00
Broxzier 40bb41d15d pinner for fence height, apply-all works for lift hill & cleanups 
- Removes old (now unused) string
- Cleans up includes in tile_inspector.c
- Properly invalidating widgets upon changes made
- Invalidates tile when lift hill is changed
- Makes 'apply to all' works for lift hills
 2016-10-11 23:21:35 +02:00
Broxzier a894fa44d4 Add toggle to raise/lower entire track block, and to raise fances 
On top of that, added the definition of one of the map flags, and an
assert that I placed while debugging, which wouldn't hurt leaving there.
 2016-10-11 23:21:34 +02:00
Hielke Morsink 874ccb4c6c Added sort button, cleaned up page switching. 2016-10-11 23:21:32 +02:00
Hielke Morsink 5b57e3e5e9 Corrected comments 2016-10-11 23:21:31 +02:00
Hielke Morsink 863aa236a3 Displaying track ID and sequence 2016-10-11 23:21:30 +02:00
Hielke Morsink 6b16c18532 Solved string allocation issue by passing two arguments now (thanks Ted)! 2016-10-11 23:21:29 +02:00
Hielke Morsink 263c64dfba Added ride information for tracks, and some minor fixes 
- Displaying ride infoormation for track pieces (type, ID, name)
- Allowing to change height of a track piece
- Allowing to set and upset wether a track piece is a lift hill
- Consistent text colouring for all labels and widgets
- Making use of the chain flag instead of magic numbers
- Fixed 'insert corrupt element' not working (button was not enabled
  anymore)
- Formatting: ordered includes, consistent variable naming, comments for
  closing switches
 2016-10-11 23:20:18 +02:00
Hielke Morsink 8f94976409 Added land ownership status to details. 2016-10-11 23:12:08 +02:00
Hielke Morsink c19339edfe Minor improvements 
- Paths are now properly rotated, including flat ones
- Banners can not be rotated
- The X and Y coordinates can be changed with spinners
- Highligint selected tile while now hovering over viewport
- Added helper function for enabling and disabling widgets more easily
 2016-10-11 23:12:07 +02:00
Hielke Morsink 2c93b5b3e3 Replaced buttons with spinners and checkboxes 2016-10-11 23:10:15 +02:00
Hielke Morsink c10c1e4496 Refactored to make extending the group boxes easy 2016-10-11 23:10:14 +02:00
Hielke Morsink e449f88479 Path details and properties 2016-10-11 23:10:13 +02:00
Hielke Morsink 86cd6aea60 [WIP] Prepared group boxes for details and properties 2016-10-11 22:18:09 +02:00
Ted John 33a6c4fce3 Refactor cursors to C++ and improve isolation 2016-10-11 18:23:49 +01:00
Michał Janiszewski 7f9fa28995 Fix uninitialised variables 2016-10-09 22:43:07 +02:00
LRFLEW e5ff7412e4 Refactor/Improve String and Path Handling 2016-10-09 15:29:58 -05:00
Michał Janiszewski 9966052ca7 Fix more configurations 2016-10-06 23:32:10 +02:00
Michał Janiszewski c9b0d9e24d Initialise all variables flagged by -Wmaybe-uninitialized 2016-10-06 23:13:28 +02:00
Ted John 4f247c16b2 Fix #4525: Track Designs Manager Crashing 
Handle tracks that use a vehicle object that can not be found, fall-back if possible to another object of the same ride type.
 2016-10-05 21:34:32 +01:00
Ted John 001120e6b2 Fix #4531: Ride sound focus not available any longer 
Only reset the ride viewport if it the window has actually been resized and maintain the viewport flags.
 2016-10-05 19:08:20 +01:00
Michael Steenbeek 2f2c2beb7f Merge pull request #4375 from jensj12/trains-tooltip 
Allow 31 trains per ride (cheat and tooltip), solves #3537
 2016-10-02 10:08:57 +02:00
Ted John c333b0c4df Fix #3963: Messages ignore paused game 2016-10-02 01:49:58 +01:00
jensj12 44a53dd031 Allow 31 trains per ride (cheat and tooltip) 
Changes the disable train lenght limit cheat to also disable the limit on the number of trains and renames it to 'disable vehicle limits'. Now any tracked ride can have up to 31 trains with 255 cars each. To reduce confusion, I also added a tooltip to the spinners on the vehicle tab.
 2016-10-01 20:58:46 +02:00
Ted John ac5c8d7e1f Fix #2384: Testing a ride with a stretched out window leaves artifacts 2016-10-01 15:13:24 +01:00
Michał Janiszewski 3f767ed8ff Fix release builds with -Warray-bounds enabled 2016-10-01 13:50:05 +01:00
Ted John e26b2d4047 Fix #4462: Multiple Corkscrew RC track sprites missing in build window 
rct_trackdefinition.special should have been signed.
 2016-09-29 18:45:49 +01:00
Michael Steenbeek a170eeb367 Merge pull request #4302 from wolfreak99/render_rain_toggle 
Add option to disable weather gloom and rain effects
 2016-09-24 13:17:49 +02:00
Ted John 5c5e9095db Fix #4476: Assertion Failed 
Disable track preview for OpenGL drawing until a later time where we can use a different drawing engine for track preview alongside OpenGL.
 2016-09-24 01:07:40 +01:00
wolfreak99 9a708cd9d2 auto-disable lightning without modifying config. 2016-09-21 10:37:50 -04:00
wolfreak99 ce85e0e743 Make lightning disabled while weather effects are disabled (Gymnasiast 
suggestion)

Interpreting Gymnasiast part 2
 2016-09-21 10:36:35 -04:00
wolfreak99 c60396cb53 Add option to disable weather gloom and rain effects 2016-09-21 10:35:02 -04:00
duncanspumpkin 9840a73cc1 Refactor naming of paint global vars 
Removed EDF81C from none viewport files this previously was used to pass image flags to the sprite renderer.
gUnkF1A4CC replaced with address reference to paint struct array to allow for non rct builds
Renamed _paint_structs to _paint_struct_quadrants. This array is used for working out which paint struct is at which quadrant and is not the main paint struct array
 2016-09-20 18:08:45 +01:00
Marijn van der Werf 487d6d8f15 Remove unnecessary addresses.h imports 2016-09-17 20:59:55 +01:00
Ted John f4cf1d6158 Integrate gUnkF1A4CC 2016-09-17 16:14:46 +01:00
Ted John 9d37b8bb9c Centre overall ride view on resize 2016-09-17 14:30:45 +01:00
Ted John b43ff24c3e Use non _t versions of int for consistency 2016-09-14 23:37:01 +01:00
Michał Janiszewski f6daea7cef Guard against passing NULL to qsort() 2016-09-11 21:20:48 +02:00
Ted John 64df46ba16 Integrate and remove unused globals 2016-09-11 01:02:16 +01:00
Ted John 7edcd11aa7 Integrate entertainer costumes 2016-09-11 00:40:51 +01:00
Ted John 0553ed5b95 Integrate various buffers 2016-09-10 23:01:42 +01:00
Ted John 07ce3c67ee Integrate last address in guest_list.c 2016-09-10 22:49:30 +01:00
Ted John ab12cda49d Remove unnecessary draw string and address 2016-09-10 22:49:30 +01:00
Ted John 83de03b260 Remove unused address in about.c 2016-09-10 22:49:30 +01:00
Ted John 4350e53392 Integrate gS6Info 2016-09-10 18:30:53 +01:00
Ted John f36485557d Integrate remaining globals in ride window 2016-09-10 18:21:05 +01:00
Ted John 17198cfdb2 Integrate gTrackDesignSaveMode 2016-09-10 18:03:25 +01:00
Ted John d2b3a08739 Misc cleanup of RCT2_GLOBAL 2016-09-10 17:55:32 +01:00
Ted John 8950a03822 Integrate variables in top_toolbar.c 2016-09-10 17:52:46 +01:00
Ted John 20c35b10eb Integrate variables in park.c 2016-09-10 17:46:34 +01:00
Ted John f81c394c8b Remove unused variables 2016-09-10 15:22:14 +01:00
Ted John 2299b22cbc Integrate staff variables 2016-09-10 15:17:18 +01:00
Ted John 2db375fb32 Integrate some ride variables 2016-09-10 14:37:20 +01:00
Ted John 9f4a70d642 Integrate more ride construction variables 2016-09-10 14:30:16 +01:00
Ted John 1f0820f662 Integrate various ride construction variables 2016-09-10 14:13:36 +01:00
Ted John b5211a41de Integrate viewport ref counters 2016-09-10 12:35:18 +01:00
Ted John d0950af9df Integrate gClearSceneryCost and gLandRightsCost 2016-09-10 12:28:01 +01:00
Ted John b1e9810ec6 Fix shop profit calculation by using integrated variables 2016-09-09 23:48:17 +01:00
Ted John 952b9cb194 Remove remaining GLOBALs from guest window 2016-09-09 23:39:00 +01:00
Marijn van der Werf c2a6eba1d3 Skip zeroed ride design previews 2016-09-09 22:15:29 +01:00
wolfreak99 498bab24c3 Fix window limit displayed in options 2016-09-09 17:16:12 +01:00
Ted John cdaddaa00d Fix #4385: Wrong numbers in guests thoughts summary 
get_arguments_from_peep was not setting the output thought arguments when a guest had no valid thought.
 2016-09-08 22:06:39 +01:00
Michał Janiszewski 163e314379 Remove unused or set-but-not-read variables 2016-09-07 13:39:29 +01:00
Ted John 220afe04d5 x64: Fix readentirefile calls 2016-09-06 21:33:15 +01:00
Ted John 2b33c3d55e Integrate globals in new_ride.c 2016-09-05 23:20:08 +01:00
Ted John 248424e6ad Remove uses of 0x009BC677 buffer 2016-09-05 23:00:17 +01:00
Ted John 1e65c7e940 Replace cursor position globals with gCursorState 2016-09-05 22:37:57 +01:00
Ted John 1c9164d3d3 Use stack space instead of RCT2 string address 2016-09-05 22:34:07 +01:00
Ted John 32a6722cda Integrate gEditorSelectedObjects 2016-09-05 22:26:02 +01:00
Ted John db327d26c8 Remove RCT2_GLOBALs from track_list.c 2016-09-05 21:21:33 +01:00
Ted John 584ac8031f Integrate tooltip text and num lines 2016-09-05 21:13:53 +01:00
Ted John 4a82cd0696 Centre keyboard shortcut key change window 2016-09-05 21:06:56 +01:00
Ted John 2dc315f228 Integrate gKeyboardShortcutChangeId 2016-09-05 21:04:22 +01:00
Ted John 3c5d4adcf0 Remove RCT2_GLOBALs from staff window 2016-09-05 20:59:38 +01:00
Ted John 3b8e2436c2 Clean up window_map_place_park_entrance_tool_down 2016-09-05 20:26:33 +01:00
Ted John aa15ff6ed9 Fix #4379: x64: Crash when clicking audio device dropdown 
The dropdown arguments are limited to 8 bytes which was not enough for STRING and the 64-bit address for the string. A similar issue also for the dropdown text field. Changed to same solution as other dropdowns.
 2016-09-05 00:05:48 +01:00
Ted John 2cd16a6fe5 Remove unread variable 2016-09-04 21:47:05 +01:00
Michał Janiszewski bfe1a7b58f Drop RCT2_GLOBAL from regular pointer 2016-09-04 21:19:19 +02:00