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

9163 Commits

Author SHA1 Message Date
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
Ted John
8ffe9cdcf6 Pass build properties to openrct2.sln 2016-09-18 11:24:46 +01:00
OpenRCT2 git bot
b3ef319dc9 Merge Localisation/master into OpenRCT2/develop. 2016-09-18 04:00:21 +00:00
Ted John
011f3eecd0 Merge pull request #4444 from OpenRCT2/x64-full-no-rct2
Make NO_RCT2 fully stand alone without segment loading
2016-09-17 23:30:28 +01:00
Ted John
d786e57914 Move registers struct to common.h
So that it can still be used in x64 builds
2016-09-17 23:12:25 +01:00
Michał Janiszewski
2d5de506f4 Fix guards for NO_RCT2 builds 2016-09-17 22:59:32 +01:00
Ted John
20863bce52 Guard segments definition in USE_MMAP 2016-09-17 21:07:17 +01:00
Marijn van der Werf
487d6d8f15 Remove unnecessary addresses.h imports 2016-09-17 20:59:55 +01:00
Ted John
7c05ceb275 Make x64 fully stand alone without segment loading 2016-09-17 19:29:39 +01:00
Ted John
665f5e794b Merge pull request #4442 from marijnvdwerf/integrate/vehicle
Integrate vehicle data
2016-09-17 19:15:27 +01:00
Marijn van der Werf
65919029ae Integrate data at 0x0098DA64 2016-09-17 19:14:06 +01:00
Marijn van der Werf
a3a8484059 Complete integration of 0x009A3B04 2016-09-17 19:54:44 +02:00
Marijn van der Werf
a76e21a767 Integrate data at 0x009A37C4 2016-09-17 19:49:52 +02:00
Marijn van der Werf
1a6392cbc9 Integrate data at 0x009A37E4 - 0x009A39C4 2016-09-17 19:08:30 +02:00
Ted John
375069384b Fix x64 builds 2016-09-17 16:35:19 +01:00
Ted John
c255333135 Fix CI 2016-09-17 16:33:35 +01:00
Ted John
c183b65065 Fix original paint mode 2016-09-17 16:32:36 +01:00
Ted John
0791def825 Integrate _unkEE788C 2016-09-17 16:21:13 +01:00
Ted John
f4cf1d6158 Integrate gUnkF1A4CC 2016-09-17 16:14:46 +01:00
Ted John
4f34accfea Integrate _spriteFontCharacterWidths 2016-09-17 16:07:34 +01:00
Ted John
9f847ca8bb Remove old RCT2 compatibility from vehicle paint 2016-09-17 15:58:59 +01:00
Ted John
c2ca1316e8 Integrate / remove various GLOBALs 2016-09-17 15:51:06 +01:00
Marijn van der Werf
59d2c7a341 Integrate table at 0x009A36C4 2016-09-17 16:07:45 +02:00
Ted John
9d37b8bb9c Centre overall ride view on resize 2016-09-17 14:30:45 +01:00
Ted John
69eca489da Integrate gSavedView... 2016-09-17 14:10:39 +01:00
Ted John
05e510f003 Remove unused CALLPROC 2016-09-17 14:08:01 +01:00
Marijn van der Werf
4ba7b6820c Integrate data at 0x0098D884 2016-09-17 14:01:08 +01:00
Ted John
e96b1820c8 Integrate remaining GLOBALs in viewport.c 2016-09-17 13:59:41 +01:00
Ted John
1c6f964773 Integrate _viewportDpi1 and _viewportDpi2 2016-09-17 13:38:18 +01:00
Marijn van der Werf
5f24e57c51 Partially integrate gCurrentViewportFlags
The two bytes after RCT2_ADDRESS_CURRENT_VIEWPORT_FLAGS don't seem to be used, according to IDA. As far as I understand endianness, updating from an uin16 to an uint32 should be save.
2016-09-17 13:15:47 +01:00
Ted John
06406de725 Fix AppVeyor, add signtool to PATH 2016-09-16 22:43:45 +01:00
Ted John
edb918a883 Fix heap overflow in getTunnelEdgeString 2016-09-16 18:59:41 +01:00
Ted John
814f67fb3d Revert "Remove unoriginal junior RC tracks"
This reverts commit 6d03980f20.
2016-09-16 18:54:54 +01:00
Ted John
0fbd27a5de Merge pull request #4330 from marijnvdwerf/feature/paint-unit-test
Attempt to add unit testing for track drawing
2016-09-16 18:51:38 +01:00
Marijn van der Werf
18a6d4246b Update scheme to Xcode 8 2016-09-16 19:49:16 +02:00
Ted John
dbb822ad35 Ignore zero sized array warning to fix VS builds 2016-09-16 19:45:25 +02:00
Marijn van der Werf
c233e0491a Improve tunnel offset detection 2016-09-16 19:45:24 +02:00
Marijn van der Werf
52282e399b Use named addresses for bound box catching 2016-09-16 19:45:22 +02:00
Marijn van der Werf
9ca2f89831 Improve test output 2016-09-16 19:45:21 +02:00
Marijn van der Werf
c526d0da3f Rename default palette options 2016-09-16 19:45:13 +02:00
Marijn van der Werf
5524bd0e14 Print address of failed function 2016-09-16 19:45:11 +02:00
Marijn van der Werf
1c585e45e3 Improve Visual Studio compatibility 2016-09-16 19:45:10 +02:00
Marijn van der Werf
987bfa409a Improve track type support check 2016-09-16 19:45:09 +02:00
Marijn van der Werf
f2f99d7bb1 Improve environment simulation 2016-09-16 19:45:08 +02:00
Marijn van der Werf
8982d87e77 Add missing paint functions to track_data_old 2016-09-16 19:45:07 +02:00
Marijn van der Werf
4e4a07d1b0 Update testpaint to match develop 2016-09-16 19:45:07 +02:00
Marijn van der Werf
1cc43d5012 Add missing compat function 2016-09-16 19:45:05 +02:00
Marijn van der Werf
0f51be809c Update code to match develop 2016-09-16 19:45:04 +02:00
Marijn van der Werf
2d688e1056 Expand message for support height mismatch 2016-09-16 19:45:03 +02:00