1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Commit Graph

148 Commits

Author SHA1 Message Date
Michał Janiszewski
5b0636cf0d Adapt Linux UiContext to Emscripten 2017-09-08 11:57:24 +02:00
ζeh Matt
1f3ccae8b1 Refactor remaining image flag constants to defined G1_* flags. (#6217)
Refactor gUnk9DE568 and gUnk9DE56C to be type of rct_xy16 called gPaintSpritePosition
Rename unk_9ABDA4 to gCurrentColourPalette.
Rename gUnkEDF81C to gCurrentImageType.
Rename sub_679236_679662_679B0D_679FF1 to pixel_is_present.
Remove unused variables _unk9ABDAE, _unk9AC149, unk_9E3CE4, only ever assigned but never read.
Remove unreferenced variable unk_9E3CDC.
Clean up some parts in sub_679236_679662_679B0D_679FF1.
Remove function sub_68371D and references, it assigns variables that are never used.
Add assert determine if unused code.
2017-09-02 14:01:08 +01:00
Dennis-Z
859faa4bad Fix ghosting when moving over transparent map elements 2017-09-01 21:02:11 +02:00
Ted John
3f1991804a Add debug option to show dirty blocks 2017-08-31 22:36:15 +01:00
wolfreak99
8e93c69e47 Implement console scrolling by pageup and pagedown 2017-08-26 18:19:03 +02:00
wolfreak99
3e4d4ca56f Allow Random Terrain and Place Trees on Simplex Map Generator 2017-08-23 08:56:56 +02:00
Richard Jenkins
71e580a58f Refactor game load functions, resolves #6011 2017-08-23 08:04:36 +02:00
Tomas Dittmann
841bc52027 Use desktop-hwnd as directorydialog-owner, fixes #6198
Restore the mainwindow after the dialog. Correctly cleanup COM memory.
2017-08-22 23:07:36 +02:00
Dennis-Z
abf440d01c Fix viewport clipping issues with the OpenGL renderer (#6188) 2017-08-16 22:11:43 +01:00
jensj12
c3a5ffbe04 Implement #3994: Show bottom toolbar with map tooltip 2017-08-16 22:27:20 +02:00
Tomas Dittmann
d266ab5f91 Fix #6133: Construction rights not shown after selecting buy mode
tool_set() cancels the previous tool, so it has to be called first or it will cancel the _landRightsMode that was meant to be activated.
2017-08-16 10:22:27 +02:00
Dennis-Z
2c2c5a6fde Remove unused hardcoded color table
Was previously used for the old FiltRect stuff
2017-08-16 00:43:52 +02:00
Dennis-Z
75b784c107 Flush OpenGL command buffers before drawing a rectangle instead of after
This fixes an issue causing the first rectangle that is being drawn
to not be over whatever was previously drawn.
2017-08-16 00:43:47 +02:00
Dennis-Z
634ee96f54 Implement OpenGL renderer FilterRect through palette remapping
Replace the previous "filtering" of rectangles based on
luminance, now using a remap palette like the software renderer for
better output colors.
Various other simplifications regarding to rectangle rendering are
included here too.
2017-08-16 00:43:41 +02:00
Dennis-Z
97ad4ac402 Register/load glUniform1iv function 2017-08-16 00:43:25 +02:00
Michał Janiszewski
d698ad1100 Convert NULL -> nullptr in C++ 2017-08-15 11:51:56 +02:00
Michał Janiszewski
44c8c84b7c Convert integers acting as bools to bools (#6177)
Also fixes MSVC2015 according to AppVeyor
2017-08-15 09:03:10 +01:00
Marijn van der Werf
294cef3c9b Move additional windows to UI project 2017-08-14 23:53:28 +02:00
Dennis-Z
85c89481a5 Recreating the atlasses texture instead of changing the format of the existing atlasses texture (#6159)
This improves performance
2017-08-12 13:04:26 +01:00
Michał Janiszewski
f9342438e3 Include SDL2 as system headers
On some systems defines may be checked for value even though not present
2017-08-10 17:04:08 +02:00
Marijn van der Werf
247fdc2f5d Fix formatting of C includes 2017-08-10 13:42:27 +02:00
Michał Janiszewski
38f4f8be79 Fix missing includes 2017-08-10 13:42:27 +02:00
Michał Janiszewski
872b3e2039 Update casing of header file 2017-08-10 13:42:27 +02:00
duncanspumpkin
81201a43ac Fix VS project file 2017-08-10 13:42:27 +02:00
Marijn van der Werf
4d90940d21 Move windows to UI project 2017-08-10 13:42:27 +02:00
Ted John
f3ef92edcb Fix MSVC build errors and warnings 2017-08-10 13:42:27 +02:00
Marijn van der Werf
a53a7ab706 Convert remaining dialogs 2017-08-10 13:42:27 +02:00
Michał Janiszewski
1df22c889d Update minimum required CMake version to 3.1 2017-08-09 23:30:18 +02:00
Duncan
77330ac257 Fix #5890. Primary and secondary colours now work in zoomed opengl. (#6109)
Mistake made due to a missunderstanding of how the software renderer works. At this point in the software renderer the primary and secondary colours are already calculated into the palette so can be ignored. In opengl the colours still need to be passed to the command queue. Fixes #4715 as well.

Update changelog
2017-08-02 20:58:11 +01:00
Ted John
6699d0885b Merge pull request #6065 from IntelOrca/refactor/remove-rct2.c
Move remaining functions out rct2.c
2017-07-30 18:09:26 +01:00
Michał Janiszewski
9eb0dc6ea9 Fix wrong mouse button being released on FingerUp event 2017-07-30 17:57:07 +02:00
Michał Janiszewski
eb76b188ae Ensure UiContext deletes allocated resources 2017-07-30 17:34:30 +02:00
Michał Janiszewski
d5e6ab3111 Properly dispose of AudioMixer to plug memleak 2017-07-30 17:21:36 +02:00
Ted John
8b2eb8a13e Move screen variables to OpenRCT2.h 2017-07-29 20:29:29 +01:00
Ted John
e6e503a853 Move path related functions to Context.cpp
- rct2_init_directories
- get_file_path
2017-07-29 20:29:26 +01:00
Ted John
8bc4e52ae9 Move rct2_quit to Context 2017-07-29 20:28:18 +01:00
Michał Janiszewski
70793f65a5 Verify queried renderer information 2017-07-28 08:06:11 +02:00
Kuriibo
59fabad37c Added new string for shortcut, validate_global_widx 2017-07-26 17:23:47 +01:00
Kuriibo
d0db59e196 Keyboard Shortcut for Scenery Remover - #5835
Added a hotkey for the "clear scenery" window. By default, the hotkey is the "b" key (b/c bulldozer).
2017-07-26 17:23:47 +01:00
ZehMatt
fabf7f9fb5 Refactored window flags only being updated every 1000ms. 2017-07-25 08:33:57 +02:00
Ted John
bc88cb9c2b Make TitleScreen a class (#5971) 2017-07-22 23:42:14 +01:00
Ted John
01b0047675 Invert Painter dependency
Make painter call into the drawing engine, rather than the drawing engine create and call the painter.
2017-07-16 23:25:11 +01:00
Ted John
cb884dad11 Refactor rct2_draw to a new Painter class
Right now this is created for each drawing engine, but should eventually be a dependency into them.
2017-07-16 23:25:11 +01:00
Ted John
7fbcf1ab0b Move rct2_update into Context 2017-07-16 23:25:11 +01:00
Sjors Gielen
553e16144b Fix null pointer dereference when cancelling an RCT1 location dialog on Mac OS X.
To reproduce, run openrct2 on OSX, go to the options dialog, then to the bottom
of the misc tab, select an RCT1 location. Then, cancel that dialog. This would
trigger a null pointer dereference by returning std::string(nullptr).
2017-07-14 13:33:54 +02:00
Ted John
a808da910c Merge pull request #5885 from willox/gltransparency
Fix regression in OpenGL DrawImageCommand flags
2017-07-13 19:17:59 +01:00
William Wallace
ae110a9159 Allow switching between OpenGL and other renderers without restarting 2017-07-13 19:04:37 +01:00
William Wallace
ab39262ccf Remove incorrect/unnecessary OpenGL API calls 2017-07-13 19:04:37 +01:00
William Wallace
fbb424ba21 Add enums for DrawImageInstance flags 2017-07-13 18:10:14 +01:00
William Wallace
110d01f863 Fix regression in OpenGL DrawImageCommand flags
Flag 1 isn't supposed to be set when flag 3 is set.
2017-07-13 15:42:46 +01:00