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
7,891 Commits 8 Branches 59 Tags
bd038c63b2db6bd2b9495634e4acf41209310cc2
Commit Graph

7891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OpenRCT2 git bot
bd038c63b2 Merge Localisation/master into OpenRCT2/develop. 2016-06-14 04:00:17 +00:00
Ted John
3d76480808 fix #1433: Peep spawn point does not get set using sandbox mode 
Now show peep spawns if in editor OR in sandbox mode.
 2016-06-13 21:23:30 +01:00
Ted John
602d84156c fix #3856: Save Game causes Crash 2016-06-13 19:39:11 +01:00
Ted John
4b2f0b4119 fix #3825: Multiplayer crashes with UI buttons 
Window was measuring number of lines of user's config server description rather than the connected server's description
 2016-06-13 19:02:37 +01:00
YJSoft
7a7813693c Delete useless if statement at build.sh (#3870) 
`$SYSTEM != "Darwin"` First if
so `$SYSTEM == "Darwin"` will be useless.
 2016-06-13 15:26:59 +02:00
OpenRCT2 git bot
a91f12dd6b Merge Localisation/master into OpenRCT2/develop. 2016-06-13 04:00:17 +00:00
Ted John
79c8455cad Merge pull request #3862 from OpenRCT2/feature/opengl3 
Implement OpenGL 3 drawing
 2016-06-13 00:13:13 +01:00
Ted John
3d21fbd311 Merge pull request #3866 from LRFLEW/feature/opengl3 
Fix OS X (and Linux) feature/opengl3
 2016-06-13 00:00:01 +01:00
LRFLEW
0311fdd35c Fixed Depricated Enum Drawing Errors 2016-06-12 17:55:48 -05:00
LRFLEW
3db558f236 Updated Xcode Project 2016-06-12 17:45:18 -05:00
Michał Janiszewski
e0bb89d1d6 Explicitly request OpenGL 3.3 context 2016-06-12 17:45:18 -05:00
Ted John
f96c595502 copy data/shaders to bin 2016-06-12 23:42:53 +01:00
Ted John
f5604c6b69 add missing GetUniformLocation 2016-06-12 22:37:44 +01:00
Michał Janiszewski
0503b88071 Cast shader program 2016-06-12 19:22:50 +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
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
Alexander Overvoorde
ca1590c086 Add parameter to utf8_remove_formatting to allow colour codes (fixes #3638) (#3831) 2016-06-09 12:30:32 +01:00