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
Marijn van der Werf
f9670fc1d4
Add debug menu option
2016-07-26 10:55:48 +02:00
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
OpenRCT2 git bot
b95452cde0
Merge Localisation/master into OpenRCT2/develop.
2016-07-26 04:00:20 +00:00
Marijn van der Werf
215ed5e14d
Attempt to name animations
2016-07-25 22:11:35 +02:00
Duncan
7c273ae285
Merge pull request #4174 from jensj12/Fix-get-paint_bounds
...
Fix get paint_bounds
2016-07-25 19:11:01 +01:00
jensj12
e70f7d9a38
Fix get paint_bounds
...
The console command returned the wrong variable
2016-07-25 19:52:32 +02:00
Duncan
d7119d9b3b
Merge pull request #3838 from marijnvdwerf/paint-setup/draw-bound-boxes
...
Draw bound boxes
2016-07-25 18:07:41 +01:00
Marijn van der Werf
750b8d9949
Draw bound boxes
2016-07-25 14:25:35 +02:00
Yaroslav Tretyakov
3116ec3e76
Fix issue in ReceiveData
2016-07-24 21:01:14 +01: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
Ted John
291667d5bf
Merge pull request #4155 from janisozaur/verify
...
Verify inputs to various functions
2016-07-24 12:29:46 +01:00
Michał Janiszewski
e19cf781b1
Verify inputs to various functions
2016-07-24 13:18:50 +02:00
Ted John
8b79ededd9
Fix #4164 : Keep on crashing on OpenRCT2 0.0.5
...
Caused by hrow; instead of hrow Exception() when the image table is too large.
2016-07-24 11:37:42 +01:00
OpenRCT2 git bot
5b66f87031
Merge Localisation/master into OpenRCT2/develop.
2016-07-24 04:00:19 +00:00
Ted John
55ec765811
Include cmdline_sprite.h in vcxproj
2016-07-23 22:25:24 +01:00
