mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity
8,468 Commits 8 Branches 59 Tags
6ba62ed123fa7e6b15e8a0723ba4e7fa7a64770f
Commit Graph

6444 Commits

Author SHA1 Message Date
Michał Janiszewski
6ba62ed123 Integrate vehicle synchronisation info 2016-08-01 23:33:55 +02:00
Michał Janiszewski
2db2ef5eec Fix pointer types 2016-08-01 23:14:42 +02:00
Michał Janiszewski
ec8ac1a805 Change the way scrolling text positions are stored 2016-08-01 23:14:42 +02:00
Michał Janiszewski
2b85801fc3 Integrate 97e1bc 2016-08-01 23:14:42 +02:00
Michał Janiszewski
09a20524a5 Integrate gRideProperties 2016-08-01 23:14:42 +02:00
Michał Janiszewski
a71e60bed5 Make window_start_textbox accept pointer argument 2016-08-01 23:14:42 +02:00
Michał Janiszewski
a40b3c63af Convert loadsave dialog to new string format 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
Michał Janiszewski
41049e5a32 Fix positions of widgets 2016-08-01 22:17:38 +02:00
zsilencer
5d04e5e03e Multiplayer desync stuff 2016-08-01 20:47:21 +02:00
Michał Janiszewski
062ab25f95 Fix invalidation issues 2016-08-01 20:30:08 +02:00
Michał Janiszewski
e25c768a3e Convert rides set console command to use game_command interface 2016-08-01 20:30:08 +02:00
Michał Janiszewski
155bc054df Fix #4172: Expose ride-type changing capability in UI 
This also allows changing ride type in multiplayer games. Very crashy.
 2016-08-01 20:30:08 +02:00
LRFLEW
a320d4d596 Added Git Info for macOS Builds 2016-07-31 23:12:07 +02:00
Aaron van Geffen
8ddef5f889 Move version information to separate C file. 
Note: crash.cpp is still using the constants passed at compile-time.
 2016-07-31 19:01:26 +02:00
Ted John
349684b7ce Merge pull request #4146 from AaronVanGeffen/reposition-mouse 
Change mouse scroll zooming behaviour to zoom towards the cursor keeping the map position under the cursor consistent. This new behaviour is opt-out.
 2016-07-31 12:38:06 +01:00
Michael Steenbeek
ff7e119b46 Name some track design flags 2016-07-31 12:02:38 +01:00
Michael Steenbeek
05ac1a49b6 Fix #3806: Other Coaster Vehicle options not showing in Ride Window 
This error was introduced with aa929e1 (see line 204 in src/management/research.c in that commit).
 2016-07-31 12:00:58 +01:00
Aaron van Geffen
29b0b4885e Reduce code verbosity. 
This introduces the function `platform_get_cursor_position_scaled` as a common means of getting the cursor position compensated for window scaling.
 2016-07-30 22:05:13 +02:00
Aaron van Geffen
8ac1b79799 Remember and apply cursor position relative to tile. 2016-07-30 21:18:59 +02:00
Aaron van Geffen
1755fa433f Enable zoom to cursor by default. 2016-07-30 21:18:59 +02:00
Aaron van Geffen
34bef11f75 Compensate mouse position for window scaling. 2016-07-30 21:18:59 +02:00
Aaron van Geffen
ccdd7bec4f Compensate for zoom level and base height. 2016-07-30 21:18:59 +02:00
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