mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Code Issues Releases Wiki Activity
8,434 Commits 8 Branches 59 Tags
f035bfdecdd3e1d9e90290e72ab9e907e38d7b5c
Commit Graph

6419 Commits

Author SHA1 Message Date
Aaron van Geffen
f035bfdecd Try to keep the current tile under the mouse cursor. 
This still doesn't work as well as I'd like yet, most notably when zooming out.
 2016-07-30 21:18:59 +02:00
Aaron van Geffen
17cbdf795e Missing header declaration for gcc. 2016-07-30 21:18:59 +02:00
Aaron van Geffen
a1b8bdfa11 Make zooming to cursor optional. 
This adds a checkbox to the interface settings panel to enable zooming around the cursor.
If disabled, which it is by default, vanilla RCT2 behaviour is retained.
 2016-07-30 21:18:59 +02:00
Aaron van Geffen
38b59b6c31 WIP: zoom towards cursor rather than centre. 2016-07-30 21:17:48 +02:00
Michael Steenbeek
19220cbbce Add a button to the map generator window in the Map window (#4098) 
Includes many fixes by @Wirlie
 2016-07-30 21:10:04 +02:00
Michał Janiszewski
84137738e3 Disconnect client in case map sending fails 2016-07-30 10:13:08 +02:00
Michał Janiszewski
64c0c594dc Check if memory was allocated successfully for server map 
Somehow, there are cases where server thinks a map is around 2GiB in
size. Such allocation will most likely fail on 32-bit system and crash
the server. This provides *some* safety check and at least prevents
server from crashing in such cases.
 2016-07-30 10:13:08 +02:00
wolfreak99
8f254702a2 Add cheat to reset date (#4188) 2016-07-29 20:49:38 +02: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
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
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
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
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
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
763ae7edd7 Use #define instead of constant 2016-07-26 23:16:25 +02: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