1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Commit Graph

755 Commits

Author SHA1 Message Date
Michał Janiszewski
e25c768a3e Convert rides set console command to use game_command interface 2016-08-01 20:30:08 +02:00
Aaron van Geffen
29b0b4885e Reduce code verbosity.
This introduces the function `platform_get_cursor_position_scaled` as a common means of getting the cursor position compensated for window scaling.
2016-07-30 22:05:13 +02:00
Aaron van Geffen
8ac1b79799 Remember and apply cursor position relative to tile. 2016-07-30 21:18:59 +02:00
Aaron van Geffen
34bef11f75 Compensate mouse position for window scaling. 2016-07-30 21:18:59 +02:00
Aaron van Geffen
ccdd7bec4f Compensate for zoom level and base height. 2016-07-30 21:18:59 +02:00
Aaron van Geffen
f035bfdecd Try to keep the current tile under the mouse cursor.
This still doesn't work as well as I'd like yet, most notably when zooming out.
2016-07-30 21:18:59 +02:00
Aaron van Geffen
17cbdf795e Missing header declaration for gcc. 2016-07-30 21:18:59 +02:00
Aaron van Geffen
a1b8bdfa11 Make zooming to cursor optional.
This adds a checkbox to the interface settings panel to enable zooming around the cursor.
If disabled, which it is by default, vanilla RCT2 behaviour is retained.
2016-07-30 21:18:59 +02:00
Aaron van Geffen
38b59b6c31 WIP: zoom towards cursor rather than centre. 2016-07-30 21:17:48 +02:00
Ted John
d8d39c1ade Merge pull request #4175 from marijnvdwerf/paint-setup/debug-window
Add paint debug window.
2016-07-26 23:47:39 +01:00
Ted John
63eb861cbd Merge pull request #4163 from Niels-NTG/patch-1
Save screenshot with more meaningful filenames, park name and local date / time of computer.
2016-07-26 21:28:41 +01:00
Marijn van der Werf
dd756cb8be Add paint debug window 2016-07-26 10:55:47 +02:00
wolfreak99
67d4ff83e5 Fix window limit count accuracy (#4144) 2016-07-26 09:45:26 +02:00
jensj12
e70f7d9a38 Fix get paint_bounds
The console command returned the wrong variable
2016-07-25 19:52:32 +02:00
Marijn van der Werf
750b8d9949 Draw bound boxes 2016-07-25 14:25:35 +02:00
Niels NTG
017e688fcc New file naming convention for screenshots
- With this change screenshot file names have the following pattern:
save file name +  + YYYY-MM-DD hh-mm-ss + .png

- To get the correct date and time the method platform_get_time and platform_get_date are rewritten and to a version for UTC and a version for local time. This change gave the opportunity to simplify the code generating file names for autosaves.

- SOUND_WINDOW_OPEN is now the new "shutter" sound when taking screenshot.
2016-07-24 20:32:55 +02:00
sparklerfox
0b04b44dbc Include park name and time in screenshot path.
Closes #4159
2016-07-23 21:57:23 +02:00
Michał Janiszewski
9f57c82653 Refactor access to g_sprite_list
Hide g_sprite_list behind accessor function with a check. `assert` is
temporarily disabled, as it breaks nearly every park.
2016-07-17 22:19:34 +02:00
wolfreak99
57e790eba4 Correct int_valid to int_val 2016-07-16 15:13:16 +01:00
Ted John
5f41e3a0eb add function and line info to guards 2016-07-16 14:17:36 +01:00
Michał Janiszewski
601f344b40 Integrate g_music_tracking_viewport 2016-07-16 13:07:01 +01:00
Ted John
fbcaf735b9 Merge pull request #3805 from wolfreak99/window_limit
Add option to set window limit.
2016-07-15 20:54:50 +01:00
Daniel Trujillo Viedma
4f074cc07f Fix #4013: Scroll bar can get tiny for extremely long lists (#4025) 2016-07-15 21:49:00 +02:00
Sijmen Schoon
2d24678c05 Fix #4081: Scrolling over non-scroll areas causes other areas to scroll 2016-07-15 16:50:18 +01:00
wolfreak99
d879192542 travisci fix 2016-07-15 10:38:38 -04:00
wolfreak99
3b8bd8ce93 rename max_window_count to window_limit_max 2016-07-15 10:25:59 -04:00
wolfreak99
44202d0bd1 Allow setting limit on maximum windows allowed
This provides an option to set a limit on the number of windows that can
be open. Originally, the game had somewhere around 12, but was bumped up
to 64 for OpenRCT2. While this provides some value, this is for people who
prefer less windows at a time, and also for people with older computers.
The limit can be set anywhere between 8 and 64, (8 being chosen to still
preserve in-game toolbars that are counted as windows, and 64 to not
overshoot the maximum hard-coded value). This can be set in both options
and the in-game-console.
2016-07-15 07:07:34 -04:00
Michał Janiszewski
a6d0e6916e Fix function definitions to match their declarations
This makes sure every function is properly declared, which includes
proper `extern` wrappers.
2016-07-14 14:11:49 +02:00
Marijn van der Werf
5204fb0ce9 Clean up string and sprite ID's (#3977) 2016-07-14 14:07:49 +02:00
Ted John
dca816cfd3 Merge pull request #4024 from IntelOrca/refactor/object-list
Refactor and improve the object system:
- Objects are now exported to user directory under 'object'.
- Object directories are scanned recursively.
- Improves reliability of object loading and handling of bad objects.
- Improve performance of object scanning.
- Only load new objects when loading a new game.
- Improve changing language experience.
2016-07-11 23:45:45 +01:00
Michał Janiszewski
59c3656352 Init drawing engine for screenshot subcommand. Fix #4029 (#4030) 2016-07-10 12:14:31 +02:00
Michał Janiszewski
639f19adbf Fix define checks in project 2016-07-09 10:05:12 +02:00
Ted John
5b9cb813e7 fix load_object cc 2016-07-08 22:58:38 +01:00
Ted John
faf1f08b7f fix loading object via console 2016-07-08 22:58:38 +01:00
Ted John
4bed693344 fix basic object selection 2016-07-08 22:58:38 +01:00
Charles Cook
6d268099f5 Follow coding standard for project. 2016-07-05 19:40:20 -04:00
Charles Cook
5c9110b99a Prevent viewport_invalidate from causing covered viewports to redraw and cache window and viewport visibility. 2016-07-05 18:02:23 -04:00
Charles Cook
19d873fedf Prevent rendering of hidden windows. 2016-07-05 12:54:28 -04:00
Daniel Trujillo
dfd78ec359 Perform a refactor for compliance with conding style. 2016-07-01 22:02:28 +02:00
Daniel Trujillo
71a32a8750 Create custom currency configuration window 2016-07-01 22:02:28 +02:00
Michał Janiszewski
644a36a310 Fixes to -Wall compilation
By default, not all warnings are enabled. This change makes sure that
the project compiles correctly with following options turned on:

    -Wall -Wno-unused-but-set-variable -Wno-missing-braces \
    -Wno-unknown-pragmas -Wno-unused-function
2016-06-20 13:46:27 +01:00
Michał Janiszewski
402e5a32a0 Integrate path variables used by game 2016-06-19 23:52:20 +02:00
Ted John
ad1b9265dc integrate variables for various drawing pointers 2016-06-16 11:36:15 +02:00
Ted John
8185a88e47 implement drawing solid coloured sprites 2016-06-11 18:28:03 +01:00
Ted John
db01547ae6 implement OpenGL screenshot 2016-06-11 03:06:30 +01:00
Ted John
3bef65f754 Merge pull request #3824 from X123M3-256/fix_segfault
Fix segfault when passing invalid arguments to ride set type
2016-06-09 12:31:37 +01:00
Ted John
996202ac43 remove gScreenDPI 2016-06-07 22:45:36 +01:00
Ted John
932dec75d0 do not shift viewport pixels on OpenGL 2016-06-07 22:45:36 +01:00
Ted John
a8fed0c4b8 remove more references to gScreenDPI 2016-06-07 22:45:36 +01:00
Ted John
83fc6ec4af remove usages of gScreenDPI and gWindowDPI 2016-06-07 22:45:36 +01:00