Ted John
dbb4404a1d
Merge pull request #4187 from marijnvdwerf/clean/sprite-ids-1
...
Clean up raw sprite ID usage
2016-07-28 23:25:27 +01:00
Marijn van der Werf
b4f8f13849
Use sprite constants for staff list dialog
2016-07-28 23:28:32 +02:00
Marijn van der Werf
a17e6cee5e
Use constants for shop item images
2016-07-28 23:28:32 +02:00
Marijn van der Werf
9401afa68f
Use constants for colour preview images
2016-07-28 23:28:32 +02:00
Marijn van der Werf
c23750911f
Add missing description for paint debug shortcut
2016-07-28 21:49:08 +01:00
Ted John
f5e5955032
Update readme.md
...
[ci skip]
2016-07-28 12:19:40 +01:00
OpenRCT2 git bot
b115de861d
Merge Localisation/master into OpenRCT2/develop.
2016-07-28 04:00:21 +00:00
Michał Janiszewski
702ae49474
Fix gMapElements size
2016-07-28 00:33:57 +02:00
Michał Janiszewski
3fcc7ab4ef
Fix #3822 : Crash in check_and_apply_block_section_stop_site
2016-07-27 23:09:17 +01: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
Ted John
0cd0eb5ec5
Merge pull request #4147 from Overv/opengl-optimization
...
Optimise the OpenGL drawing engine by batching the drawing of sprites.
2016-07-27 22:22:28 +01:00
Alexander Overvoorde
3842728f38
Fix indentation and code style in various files
2016-07-27 16:31:25 +02:00
Ted John
17c5178dec
Merge pull request #4179 from janisozaur/network-checksum-sprites
...
Send a checksum of all the sprites occasionally in multiplayer for better desync detection.
2016-07-27 14:31:02 +01:00
Michał Janiszewski
193ca02014
Fix constness in no-network builds
2016-07-27 15:12:27 +02:00
Michał Janiszewski
04fb336d1f
Fix typo in comment
2016-07-27 15:09:30 +02:00
Michał Janiszewski
1fe5fc56c0
Checksum sprites occasionally in multiplayer
...
This creates a checksum (SHA1) every so often on server and sends this
value together with PRNG seed for client to check it has still not
desynced.
It's useful to detect a desync early on, as PRNG seeds may remain
unchanged for some more time, while damage may have already been caused.
2016-07-27 15:54:02 +02:00
Alexander Overvoorde
96be7bd861
Update changelog with improved FPS calculation
2016-07-27 04:02:56 +02:00
LRFLEW
1b157dbb31
Completely Remove DrawImageMaskedShader from XCode project
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
8256b7f83b
Fix missing override keyword for SetUncappedFrameRate functions
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
c56a683eed
Disable OpenGL vsync when uncap fps option is enabled
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
acb5c68eac
Remove debug code
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
aab5180afb
Remove DrawImageMaskedShader from XCode project
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
6acbbcfb6b
Fix assumption that colour texture and mask texture originate from same atlas
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
c107101aff
Implement dynamic atlas allocation in texture cache
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
c506e08ac2
Add more atlases to increase space efficiency and derive atlas size from device limits
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
bb3fe8b804
Implement multiple texture atlas system to handle small and large images
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
c8a0cedf33
Change rct2_measure_fps to only call time() once
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
9e6db92446
Fix type error
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
90565fe2be
Fix FPS counter accuracy for high frame rates
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
d8ce023170
Change TextureCache to use atlas instead of array
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
99a41ee828
Fix implicit boolean in GLSL code
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
f16ec771c3
Clean up DrawImageShader code
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
360a92e906
Merge draw image and draw masked image shaders
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
fbb7029de4
Implement sprite batch drawing using instancing
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
84f2a8c17c
Rewrite texture cache to use array texture
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
f8f996dfd6
Fix indentation
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
afd83fa13d
Fix clipping in FlushImages
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
09b07174e3
Change command buffer flushes to only be called when necessary
...
This currently breaks sprite draw order, I do not know why
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
e7626064f2
Change OpenGL renderer to use command buffers
2016-07-27 04:01:25 +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
Marijn van der Werf
7478cfc053
Wrap defines in round brackets
2016-07-26 23:37:22 +02:00
Marijn van der Werf
7ec458f1bd
Fix indentation of new menu option
2016-07-26 23:18:52 +02:00
Marijn van der Werf
88b8b2387e
Add file to Visual Studio project
2016-07-26 23:17:38 +02:00
Marijn van der Werf
763ae7edd7
Use `#define` instead of constant
2016-07-26 23:16:25 +02:00
Ted John
90faab400b
Merge pull request #4173 from janisozaur/network-sync
...
Reset sprite quadrant placements as part of sprite reset command.
2016-07-26 21:49:09 +01:00
Michał Janiszewski
0421c59eff
Refactor `sprite_set_coordinates`
2016-07-26 22:29:54 +02:00
Yaroslav Tretyakov
dd4e4caeaa
Reset sprite quadrant placements as part of sprite reset command
...
This addresses some sources of desyncs in multiplayer.
2016-07-26 22:29:54 +02: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
Ted John
f5f4238c0b
Merge pull request #3888 from marijnvdwerf/integrate/mini-golf
...
Integrate mini golf data.
2016-07-26 19:24:08 +01:00
Michał Janiszewski
82d52b63e6
Verify NetworkActions access
2016-07-26 15:07:33 +01:00