mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 00:34:46 +01:00
Code Issues Releases Wiki Activity
11,328 Commits 8 Branches 59 Tags
5b16e0587fccacddb834dcafe277039cf1478788
Commit Graph

11328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michał Janiszewski
0503b88071 Cast shader program 2016-06-12 19:22:50 +02:00
Marijn van der Werf
b13f499d5b Fix typo in enum value 2016-06-12 19:01:16 +02:00
Marijn van der Werf
b0d08d6e42 Make two branches match better 2016-06-12 19:00:30 +02:00
Michał Janiszewski
0ac5c3698b Fix CMake projects, restore testing with OpenGL disabled 2016-06-12 18:49:26 +02:00
Ted John
fa4662be42 add missing include 2016-06-12 17:44:58 +01:00
Matte A
9872ae03be Remove green background under the version string 2016-06-12 17:23:57 +01:00
Ted John
bd6986cd3f fix #3858: Tooltip showed when hovering over title logo 2016-06-12 17:19:31 +01:00
Ted John
f6665a188a add missing DISABLE_OPENGL guards 2016-06-12 15:47:51 +01:00
Duncan
735062396c Merge pull request #3854 from Goddesen/reformat_hire_new_staff 
Reformat of game_command_hire_new_staff_member for code readability and consistency.
 2016-06-12 09:23:50 +01:00
OpenRCT2 git bot
3266867171 Merge Localisation/master into OpenRCT2/develop. 2016-06-12 04:00:21 +00:00
Ted John
3c96171801 reduce redundant state changes 2016-06-12 00:07:01 +01:00
Ted John
e771834b87 fix offset of FillRect and DrawLine 2016-06-11 23:24:19 +01:00
Ted John
f796ef5122 fix drawing of text 2016-06-11 23:14:22 +01:00
Ted John
4896d14940 extract texture generation code to new class 2016-06-11 19:13:18 +01:00
Ted John
8185a88e47 implement drawing solid coloured sprites 2016-06-11 18:28:03 +01:00
Ted John
33799d2ab9 remove deprecated OpenGL functions 2016-06-11 17:46:54 +01:00
Ted John
e3ecb91b91 implement DrawLine with shader 2016-06-11 17:43:53 +01:00
Ted John
e34ee15738 implement overlay transparency for FillRect 2016-06-11 16:46:24 +01:00
Ted John
2a569dc062 implement a ping-pong framebuffer 2016-06-11 15:18:31 +01:00
Goddesen
956828e007 Removed magic number in staff color clamping 2016-06-11 13:09:27 +02:00
Marijn van der Werf
3edcadcbec Clean up function to use less globals 2016-06-11 11:47:44 +02:00
Marijn van der Werf
8e962c9157 Restore original path support drawing 2016-06-11 11:35:18 +02:00
duncanspumpkin
4131396844 Fix bugs 2016-06-11 11:24:45 +02:00
duncanspumpkin
a36a6c3ef9 Small refactor 2016-06-11 11:24:45 +02:00
duncanspumpkin
63f42c6d47 Fix support issue 2016-06-11 11:10:11 +02:00
duncanspumpkin
27eab3b0ec Finish implementing path bit drawings 2016-06-11 11:10:11 +02:00
duncanspumpkin
9f46773961 Start adding path bits paints 2016-06-11 11:10:11 +02:00
duncanspumpkin
1099a17686 Fix minor issue with declaration 2016-06-11 11:10:11 +02:00
duncanspumpkin
fc296428fd Finish function. Readd path additions. Fix scrolling text 2016-06-11 11:10:11 +02:00
duncanspumpkin
980e6ca30a Start last part 2016-06-11 11:07:41 +02:00
duncanspumpkin
a37d5e7382 Finish var_0A paths 2016-06-11 11:06:53 +02:00
Marijn van der Werf
9de7492121 Start decompilation of 0x6A3590 2016-06-11 11:06:53 +02:00
OpenRCT2 git bot
304d7970ac Merge Localisation/master into OpenRCT2/develop. 2016-06-11 04:00:16 +00:00
Ted John
db01547ae6 implement OpenGL screenshot 2016-06-11 03:06:30 +01:00
Ted John
b0b0b82fd1 implement scaling for OpenGL 2016-06-11 02:24:39 +01:00
Goddesen
a555038af0 Cleanup and minor style/consistency fixes 2016-06-11 01:59:53 +02:00
Goddesen
a35909af31 Refactored, cleaned, and wrapped game_command_hire_new_staff_member 2016-06-11 01:44:58 +02:00
Ted John
36c71c1398 implement FillRect transparancy 2016-06-11 00:04:13 +01:00
Ted John
84ca31a240 implement masked image shader 2016-06-10 20:17:00 +01:00
Goddesen
1ba9827a49 Minor reformat of game_command_hire_new_staff_member for readability. 2016-06-10 18:59:06 +02:00
Ted John
808afe0a81 add drawimage shader and optimise 2016-06-10 17:54:29 +01:00
Ted John
a9d49838fa add cross pattern support for fillrect shader 2016-06-10 17:54:29 +01:00
Ted John
c48031581b get the fillrect shader working 2016-06-10 17:54:29 +01:00
Ted John
e7e92f02c1 re-enable OpenGL 2016-06-10 17:54:29 +01:00
Ted John
dc7b8b4d3b add initial shader code 2016-06-10 17:54:29 +01:00
OpenRCT2 git bot
af0f77e857 Merge Localisation/master into OpenRCT2/develop. 2016-06-10 04:00:20 +00:00
Yaroslav Tretyakov
379b85f94c send fix #3836 (#3850) 2016-06-09 23:04:02 +01:00
Ted John
1761907f57 handle bad map data and close connection 2016-06-09 18:37:12 +01:00
dVoCex
27b3c71588 Send the correct map size to the master server (#3821) 
Signed-off-by: dVoCex <dVoCex@users.noreply.github.com>
 2016-06-09 12:32:25 +01:00
Ted John
3bef65f754 Merge pull request #3824 from X123M3-256/fix_segfault 
Fix segfault when passing invalid arguments to ride set type
 2016-06-09 12:31:37 +01:00