mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 01:35:06 +01:00
Code Issues Releases Wiki Activity
9,256 Commits 8 Branches 59 Tags
209ec19c8ceedbaad0e69d87ccb5a43411c0e5b3
Commit Graph

334 Commits

Author SHA1 Message Date
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
Ted John
4a0a93d003 Merge pull request #4449 from duncanspumpkin/gl2 
OpenGL Palettes
 2016-09-23 21:41:09 +01:00
duncanspumpkin
48086503a6 Fix zooming size for opengl sprites 2016-09-21 19:06:45 +01: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
duncanspumpkin
56fddac199 Fix broken zoomed textures and palettes 
Zoomed textures were failing to pass the image flags to the zoomed version of the texture. This would cause corrupted data to be passed as a tertiary colour to the palette function.
Also due to not recording the image flags in the palette hash map a tertiary colour of zero would be ignored and unremaped pink colour would be shown
 2016-09-19 19:00:26 +01:00
duncanspumpkin
5f7a6fb369 Fixed OpenGL palette drawing 
Added palettes to the texture atlas and now correctly use them to generate
images. Transparency semi supported but the colours are not quite
correct.
 2016-09-18 20:28:46 +01:00
Marijn van der Werf
487d6d8f15 Remove unnecessary addresses.h imports 2016-09-17 20:59:55 +01:00
Ted John
375069384b Fix x64 builds 2016-09-17 16:35:19 +01:00
Ted John
c183b65065 Fix original paint mode 2016-09-17 16:32:36 +01:00
Ted John
4f34accfea Integrate _spriteFontCharacterWidths 2016-09-17 16:07:34 +01:00
Ted John
c9fd1e66ef Remove 0x8000000 fill rect flag from software renderer 
It was never ever hit and probably didn't work properly.
 2016-09-14 18:35:44 +01:00
Ted John
e4cb01e04b Integrate gUnkEDF81C 2016-09-14 18:29:56 +01:00
Duncan
00e2d44264 Refactor sprite functions 2016-09-14 18:22:37 +01:00
LRFLEW
e1b6319bc1 Fix Warnings in Xcode about Copy Elision 2016-09-13 18:07:40 -05:00
Manuel Vögele
f7caa55ee1 Defer instantiation of TextureCache until OpenGL is initialized 
If TextureCache is instantiated before OpenGL is initialized and
something goes wrong during OpenGL initialization the destructor of
TextureCache calls an OpenGL function which will cause the application
to crash.
 2016-09-13 18:46:26 +02:00
Manuel Vögele
6486c4f6ea Show exception messages when initializing a drawing engine fails 2016-09-13 18:28:44 +02:00
Ted John
44214ab2b8 Integrate gCurrentFont fully 2016-09-12 20:43:43 +01:00
Ted John
5db4f4f2ee Remove references to 0x009C383D 2016-09-10 23:48:29 +01:00
Ted John
fe7800a508 Integrate _drawScrollTextList and _characterBitmaps 2016-09-10 23:42:19 +01:00
Ted John
17198cfdb2 Integrate gTrackDesignSaveMode 2016-09-10 18:03:25 +01:00
Ted John
d12804b242 Show message boxes if unable to load g1 / g2 2016-09-10 12:45:33 +01:00
Michał Janiszewski
2759772fca Cleanup in SoftwareDrawingEngine::DisplayViaTexture 2016-09-09 20:00:06 +01:00
Michał Janiszewski
163e314379 Remove unused or set-but-not-read variables 2016-09-07 13:39:29 +01:00
Ted John
00bfe1befb Use RCT2_ADDRESS macro so mmap works correctly 2016-09-06 00:10:58 +01:00
Ted John
6a665330c2 Integrate gCommonStringFormatBuffer 2016-09-04 15:55:37 +01:00
Ted John
d24010b1b5 Add dead code check in FillRect 2016-09-04 00:22:56 +01:00
Michał Janiszewski
f8145b6edc Refactor inclusion of addresses.h 
addresses.h is now only included when necessary, limiting scope as much
as possible.
 2016-09-03 21:25:19 +01:00
Michał Janiszewski
599b092487 Conditionally integrate some variables 2016-09-03 18:40:23 +01:00
Duncan
755aa48712 Add deadcode asserts 2016-09-03 18:35:07 +01:00
Ted John
8cf7e87b5c Fix many warnings for x64 2016-08-27 23:32:15 +01:00
Marijn van der Werf
bdb04e3da3 Integrate data at 0x009DEDF4 2016-08-21 14:24:55 +02:00
Marijn van der Werf
5a03c6b129 Integrate palettes 2016-08-21 13:53:31 +02:00
Marijn van der Werf
9319bee91f Use already integrated data 2016-08-20 22:12:52 +01:00
Marijn van der Werf
30fd2160d7 Integrate data at 0x0097FEFC 2016-08-14 11:37:59 +02:00
Michael Steenbeek
7f71bece5c Clean up some residual usage of non-integrated versions of already integrated variables 2016-08-13 10:52:42 +01:00
YJSoft
4117e9a9e5 fix #4251 Banner font is black when using ttf font (#4272) 2016-08-13 10:29:04 +02:00
Marijn van der Werf
198ebd0cb1 Use constants for colours 2016-08-07 12:57:12 +02:00
Michał Janiszewski
0ece63a7f6 Wrap RCT2's addresses in RCT2_ADDRESS macro 2016-08-06 21:38:46 +01:00
Ted John
252a00c35f Integrate gCurrentWindowColours 2016-08-06 01:32:40 +01:00
Ted John
c3fdb99ceb Merge pull request #4199 from marijnvdwerf/clean/sprite-ids-1 
Cleanup sprite ids
 2016-08-05 17:30:03 +01:00
Michał Janiszewski
ec8ac1a805 Change the way scrolling text positions are stored 2016-08-01 23:14:42 +02:00
Michał Janiszewski
b16b6814aa Fix pointer types for 64 bit builds 2016-08-01 23:14:42 +02:00
Michał Janiszewski
ddb72b6f22 Fix sprite pointers for 64 bit builds 2016-08-01 23:14:42 +02:00
Michał Janiszewski
e6575f09ea Integrate scrolling text position offsets 2016-08-01 23:14:42 +02:00
Marijn van der Werf
cd00c0de31 Identify fade sprites 2016-08-01 19:28:22 +02:00
Marijn van der Werf
7befcd3649 Use constants for scrolling text 2016-08-01 19:19:35 +02:00
LRFLEW
c9ce11a250 Fix GetOpenGLVersion() 
This is in response to the research I did on #4047. The implementation currently in the code will not work based on what I saw. The `SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &major);` and `SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minor);` lines don't fetch the version retrieved, but the version requested. The solution I have here is the one I found worked consistently in my test case, and the one I suggested in [my comment](https://github.com/OpenRCT2/OpenRCT2/issues/4047#issuecomment-233268891).
 2016-07-27 22:26:33 +01:00
Alexander Overvoorde
3842728f38 Fix indentation and code style in various files 2016-07-27 16:31:25 +02:00