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

844 Commits

Author SHA1 Message Date
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
Ted John 3e6eb48d4c draw rain via new IRainDrawer interface 2016-06-07 22:45:36 +01:00
Ted John 85557d169d reinstate all drawing and fix resize 2016-06-07 22:45:36 +01:00
X7123M3-256 bbd7e809fd Fix whitespace 2016-06-04 21:36:27 +01:00
X7123M3-256 fc5b5966c8 Check if ride subtype is in range 2016-06-04 21:08:03 +01:00
X7123M3-256 0f630bea2f Fix formatting 2016-06-04 20:21:04 +01:00
X7123M3-256 065ffa3e3c Add additional checks on input 2016-06-04 20:19:31 +01:00
X7123M3-256 a03979087d Add error messages for invalid input 2016-06-04 19:48:39 +01:00
X7123M3-256 14f6da31c9 Fix segfaults on rides without vehicles 2016-06-04 17:44:29 +01:00
X7123M3-256 67d99a34f2 Implement command to set friction 2016-06-04 16:53:29 +01:00
Michał Janiszewski 1508e49a28 Change macro to assert_struct_size 2016-06-03 11:29:50 +02:00
Michał Janiszewski 60630b9ad7 Drop `PACKED` attribute 2016-06-03 10:55:21 +02:00
Michał Janiszewski df3030e4a9 Provide static_assert for hard-coded struct sizes. 2016-06-03 10:55:21 +02:00
Michał Janiszewski 3907fcd9d2 Explicitly pack structs 2016-06-03 10:55:21 +02:00
Ted John 618d13a9a3 save chat logs 2016-05-30 16:25:06 +01:00
Duncan c645d24c8d Add console command for scenario initial cash. (#3763) 
Add paint_segments to variable list as well
Fix #3748.
 2016-05-28 09:30:50 +01:00
CraigCraig 3f9afb9744 Various Spellchecks (#3741) 2016-05-26 09:49:19 +02:00
Ted John 714baf2979 Merge pull request #3723 from Gymnasiast/remove-bmp-screenshots 
Remove support for BMP screenshots
 2016-05-25 08:01:23 +01:00
Marijn van der Werf a96ccbf21c Add shortcut for switching between paint modes (#3714) 2016-05-24 19:59:37 +01:00
Gymnasiast 476cebca53 Removed support for BMP screenshots 2016-05-24 20:05:12 +02:00
Marijn van der Werf 603a255567 Add console command for painting segment heights (#3708) 2016-05-23 10:29:11 +01:00
Ted John 25ac99e04a add variable for gS6Info 2016-05-20 23:26:19 +01:00
Ted John 781c422c76 integrate tick variables 2016-05-20 22:56:45 +01:00
Duncan ea7e91abbc Add console command to adjust staff energy. (#3671) 
Set to 0 if you want to freeze a staff member
 2016-05-19 21:30:32 +01:00
Ted John 3fd252a8c3 integrate some staff variables 2016-05-18 23:46:46 +01:00
Ted John 48cb0e91e6 remove sub_679074 original check 2016-05-18 22:31:58 +01:00
Martin Černáč 3bdc06dc25 Refactor hard-coded strings to use string_ids.h constants (and couple sprites too) (#3658) 2016-05-18 21:51:37 +01:00
Matte A beb8e41056 Use white outlined letters in the console (#3642) 2016-05-18 20:57:11 +01:00
Ted John 8efe699754 integrate gMapTooltipFormatArgs 2016-05-18 00:02:26 +01:00
Ted John 8d4e4ed0e9 remove unread RCT2_GLOBALs 2016-05-17 23:39:37 +01:00
Ted John 1cc35dfe6e integrate common format args 2016-05-15 22:03:53 +01:00
Ted John 3d47f9869f write get entry methods for scenery and path 2016-05-15 16:09:26 +01:00
Hielke Morsink 8c1395bd46 declaring local variables where needed instead of at the top (#3599) 2016-05-15 10:25:24 +01:00
Ted John 81efb92d53 integrate map selection variables 2016-05-14 00:54:13 +01:00
Ted John 3fcb337c7b integrate variable: gWindowMapFlashingFlags 2016-05-13 22:51:16 +01:00
Ted John b58766aa3f clean up the logo and make it scalable 
- fixes #1776: graphical glitches on intro
- fixes #708: screen turns white when resizing intro
 2016-05-13 21:36:07 +01:00
Ted John 0710eb7e87 Merge pull request #3585 from janisozaur/fixes 2016-05-13 18:22:20 +01:00
janisozaur ca430e1b23 Drop unused variables (#3586) 2016-05-13 18:21:58 +01:00
Michał Janiszewski 4d05c939cf Cache accesses to get_current_rotation() 2016-05-13 13:34:27 +02:00
janisozaur 658e877955 Name all the typdef-ed structs (#3581) 2016-05-12 22:57:40 +01:00
Ted John b5c0913b76 add global macros for a few more things, ride rating related and misc 2016-05-09 22:54:22 +01:00
Ted John c77311a113 small fix and refactor of S6Importer / Exporter 2016-05-08 23:16:25 +01:00
Ted John a86bc57a96 use S6Exporter for scenario_save 2016-05-08 22:35:09 +01:00
Ted John 231ea9e97c fix rename and delete track design 2016-05-08 14:03:56 +01:00
Ted John f4f8801f2b fix memory issue and add variable for scenery toggle 2016-05-08 14:03:55 +01:00
Ted John feb34660e3 fix up track manage window 2016-05-08 14:03:54 +01:00
Ted John f00d7daef5 fix track design preview, place and refactor 2016-05-08 14:03:50 +01:00
Matte A 9421cc0bd4 Add shortcut for the Multiplayer window (#3509) 2016-05-06 21:14:49 +01:00
duncanspumpkin 7f02193411 Move around map element and sprite functions into seperate files 
Add dummy files for big file move around

Fix files so they can compile

Add copyright header

Split up functions into seperate files

Remove suffix

Move supports again

Change functions signatures to remove viewport_setup

Rename folder structure

Finish moving about files
 2016-05-05 21:41:53 +01:00
Marijn van der Werf 83f984d85a Decompile sub_685EBC 2016-05-04 18:54:43 +01:00
duncanspumpkin 72ca648135 Move painter functions into paint.c. Fix mistake in paint_attach_to_previous_ps 2016-05-04 18:54:42 +01:00
Marijn van der Werf 0dcf6ce87a Implement `paint_68818E` 2016-05-04 18:54:41 +01:00
Marijn van der Werf c84e0182e0 Decompile `paint_6881D0` 2016-05-04 18:54:41 +01:00
Marijn van der Werf e49cd101d3 Add `paint.c` 2016-05-04 18:54:40 +01:00
duncanspumpkin 221d5cb57e Label more fields. 2016-05-04 18:54:39 +01:00
duncanspumpkin d6a4ae9aff Split up attached ps's. Change field names. 2016-05-04 18:54:39 +01:00
janisozaur 68bad6505c Add and correct licence headers to all sources (#3108) 2016-05-04 18:24:41 +01:00
Michael Steenbeek 142c54852d Clean up some residual usages of old config (#3484) 2016-05-03 22:36:29 +01:00
Patrick de Wit 13701660c9 Implement customizable toggle windowed mode shortcut (#3462) 
Implement customizable toggle windowed mode shortcut
 2016-05-03 20:07:33 +01:00
Marijn van der Werf dc920475bc Fix #3481: Enable smoothing terrain transitions 2016-05-03 14:51:07 +02:00
Marijn van der Werf 3350f34820 Decompile viewport_peep_paint_setup 2016-05-02 13:42:33 +02:00
Duncan 34c6f5ab40 Merge pull request #3435 from zsilencer/paint-setup/virginia-reel 
Virginia reel paint setup
 2016-05-01 20:18:29 +01:00
Duncan c1b11743a0 Merge pull request #3358 from marijnvdwerf/paint-setup/surface-paint 
Paint setup/surface paint
 2016-05-01 19:29:40 +01:00
Marijn van der Werf 7c7d868844 Fix water selection 2016-05-01 20:10:13 +02:00
Marijn van der Werf eaa9aa7527 Make requested changes 2016-05-01 19:53:10 +02:00
Marijn van der Werf ec80cbe6c8 Draw water bottom 2016-04-30 13:46:04 +02:00
Marijn van der Werf 8b64f29dd0 Implement water back 2016-04-30 13:24:25 +02:00
Marijn van der Werf 344cb37aa3 Apply fixes 2016-04-29 22:46:18 +02:00
zsilencer 51d94328d3 Decompile vehicle_visual_launched_freefall 2016-04-28 17:30:49 -06:00
Marijn van der Werf d23f43e679 Fix clang errors 2016-04-28 22:01:47 +02:00
Marijn van der Werf 8430f3ed71 Fix clang warnings 2016-04-28 21:16:03 +02:00
Marijn van der Werf fae2d81913 Apply suggestions 2016-04-28 21:12:07 +02:00
duncanspumpkin 141a92332b Clean up staff patrol area drawing 2016-04-28 20:47:46 +02:00
Hielke Morsink cd7482b64c Better contrast and fixed flickering. (#3445) 2016-04-28 17:44:29 +01:00
Hielke Morsink 90e9197d6e Blue transparent console, so it's more clean the game still accepts input behind it. (#3370) 2016-04-28 12:34:42 +01:00
zsilencer 467cf414e8 Decompile vehicle_visual_observation_tower 2016-04-27 16:34:42 -06:00
Marijn van der Werf c6c5352175 Suggestions 2016-04-28 00:32:58 +02:00
zsilencer 307729dea0 Decompile vehicle_visual_virginia_reel 2016-04-27 16:27:45 -06:00
Marijn van der Werf 80aed7e860 Init registers VS-friendly 2016-04-27 23:34:27 +02:00
Marijn van der Werf 036f83e063 Clean up code 2016-04-27 23:33:27 +02:00
Marijn van der Werf ccf922245e Update headers 2016-04-27 23:20:07 +02:00
Marijn van der Werf 2d132232eb Apply fixes 2016-04-27 23:20:07 +02:00
Marijn van der Werf 2c198ac6ff Rename `_ebp` to `terrain_type` 2016-04-27 23:20:07 +02:00
Marijn van der Werf 2bd4ee22ed Uncomment methods 2016-04-27 23:20:07 +02:00
Marijn van der Werf c602e98366 Remove globals 2016-04-27 23:20:07 +02:00
Marijn van der Werf dc3e7db77a Fix selection 2016-04-27 23:20:07 +02:00
Marijn van der Werf 1f8123451e Fix water tool 2016-04-27 23:20:07 +02:00
Marijn van der Werf 8bdac36217 Draw shimmer on water 2016-04-27 23:20:07 +02:00
Marijn van der Werf dede8159e5 Implement basic water edge 2016-04-27 23:20:07 +02:00
Marijn van der Werf fd58208ea9 Fix mistake in array 2016-04-27 23:20:07 +02:00
Marijn van der Werf a7e37290be Fix z-layering for tunnel top 2016-04-27 23:20:07 +02:00
Marijn van der Werf 72f75428a8 Implement bottom right edges 2016-04-27 23:20:07 +02:00
Marijn van der Werf 72e9603ca9 Clean tunnel drawing 2016-04-27 23:20:07 +02:00
Marijn van der Werf 0c49043417 Decompile more tunnel stuff 2016-04-27 23:20:07 +02:00
Marijn van der Werf 70debab0fa Continue work on tunnels 2016-04-27 23:20:07 +02:00
Marijn van der Werf df4297f9d6 Draw back edges 2016-04-27 23:20:07 +02:00
Marijn van der Werf 42be9eab42 Identify smoothing arrays 2016-04-27 23:19:19 +02:00
Marijn van der Werf d056b114dd Refactor edges 2016-04-27 23:19:19 +02:00
Marijn van der Werf c6ab807ad0 Draw one top land side 2016-04-27 23:19:19 +02:00
Marijn van der Werf 91e1f106c6 Identify sprites 2016-04-27 23:19:19 +02:00
Marijn van der Werf 568556a719 Add todo 2016-04-27 23:19:19 +02:00
Marijn van der Werf 6fd4b789ee Use tabs for file 2016-04-27 23:19:19 +02:00
Marijn van der Werf c53d25922e Move surface painting to seperate file 2016-04-27 23:19:19 +02:00
Marijn van der Werf 5fae3eb07b Improve edge 2016-04-27 23:17:22 +02:00
Marijn van der Werf 74afb836db Remove log line 2016-04-27 23:17:22 +02:00
Marijn van der Werf 28d9b20248 Draw left bottom edge 2016-04-27 23:17:22 +02:00
Marijn van der Werf ff52ff0a09 Implement surface smoothing 2016-04-27 23:17:22 +02:00
Marijn van der Werf d2dc70e466 Draw transparent land 2016-04-27 23:15:17 +02:00
Marijn van der Werf 12da493869 Extract side-drawing functions 2016-04-27 23:15:17 +02:00
Marijn van der Werf 22b95ef515 Fix fence drawing 2016-04-27 23:15:17 +02:00
Marijn van der Werf 159646e717 Fix water edges 2016-04-27 23:15:17 +02:00
Marijn van der Werf 724089b8da draw fences 2016-04-27 23:15:17 +02:00