mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,854 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

7854 Commits

Author SHA1 Message Date
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
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
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
Goddesen 1ba9827a49 Minor reformat of game_command_hire_new_staff_member for readability. 2016-06-10 18:59:06 +02: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
Michał Janiszewski 4b152bac88 Make sure data sent out over wire is advanced properly (#3844) 2016-06-09 12:29:44 +01:00
Matte A cfc40c3f22 Make issue template more consistent and friendlier for newer people 2016-06-09 12:35:14 +02:00
OpenRCT2 git bot b511eb0a2e Merge Localisation/master into OpenRCT2/develop. 2016-06-09 04:00:18 +00:00
Michał Janiszewski 74780b3e70 Minor fixes to #3803 (#3843) 2016-06-08 23:40:56 +01:00
Ted John 504e5e0720 Merge pull request #3803 from IntelOrca/refactor/drawing 
Refactor drawing and add initial infrastructure for OpenGL rendering.
 2016-06-08 21:21:39 +01:00
Ted John 5a69e262d7 delete drawing engine if it fails to initialise 2016-06-08 18:14:26 +01:00
Ted John 601f8901e3 rename rain.cpp to Rain.cpp 2016-06-08 18:05:58 +01:00
Michał Janiszewski a92972eef6 Disable OpenGL for all platforms 
OpenGL rendering is not yet ready, but the infrastructure is in place.
 2016-06-08 18:02:18 +01:00
Michał Janiszewski 39472ce3f3 Update CMake targets with OpenGL linking (#17) 2016-06-08 13:28:33 +01:00
OpenRCT2 git bot 426e106111 Merge Localisation/master into OpenRCT2/develop. 2016-06-08 04:00:22 +00:00
LRFLEW 26a07333b2 Update Xcode Project (#18) 2016-06-07 22:47:31 +01:00
Ted John 40bd085f35 add OPENGL_NO_LINK ability for all platforms 2016-06-07 22:47:31 +01:00
Ted John 876336f455 fallback to software mode if engine fails to initialise 2016-06-07 22:47:31 +01:00
Ted John f14ea6873c dynamically import OpenGL functions 2016-06-07 22:47:31 +01:00
Ted John 79292b56ad allow disabling of OpenGL 2016-06-07 22:47:31 +01:00
Ted John 313110ab8d reinstate hardware display 2016-06-07 22:47:31 +01:00
Ted John 3b627651aa add drawing engine config 2016-06-07 22:47:31 +01:00
Ted John 0aba395c39 invalidate images on object load 2016-06-07 22:45:36 +01:00
Ted John ffd7b7f7e0 implement draw line for OpenGL 2016-06-07 22:45:36 +01:00
Ted John 18f3aa12a1 fix scrolling text 2016-06-07 22:45:36 +01:00
Ted John 5ca2b12f94 fix FillRect on OpenGL 2016-06-07 22:45:36 +01:00
Ted John 996202ac43 remove gScreenDPI 2016-06-07 22:45:36 +01:00
Ted John 932dec75d0 do not shift viewport pixels on OpenGL 2016-06-07 22:45:36 +01:00
Ted John a8fed0c4b8 remove more references to gScreenDPI 2016-06-07 22:45:36 +01:00
Ted John ebd9710fdf fix intro with new drawing 2016-06-07 22:45:36 +01:00
Ted John 83fc6ec4af remove usages of gScreenDPI and gWindowDPI 2016-06-07 22:45:36 +01:00
Ted John ccec48e382 do not draw windows twice on OpenGL 2016-06-07 22:45:36 +01:00
Ted John 8edc97bebe add support for OpenGL extensions 2016-06-07 22:45:36 +01:00
LRFLEW 3a7ab9b20a Updated Xcode Project (#15) 2016-06-07 22:45:36 +01:00
Ted John cf824a1859 remove unused functions 2016-06-07 22:45:36 +01:00
Ted John 8036f6c773 fix drawing of picked up peep 2016-06-07 22:45:36 +01:00
Ted John 8920c73ea4 add software / hardware rendering switch 2016-06-07 22:45:36 +01:00
Ted John aafaf0e883 try to improve zoom 2016-06-07 22:45:36 +01:00
Ted John f15a1e70f6 load textures and draw them 2016-06-07 22:45:36 +01:00
Ted John 8bff699659 draw OpenGL sprite rects 2016-06-07 22:45:36 +01:00
Ted John 2fa0c7977a add OpenGL drawing engine with FillRect impl 2016-06-07 22:45:36 +01:00
Ted John d20a8a1daa re-route draw sprite through IDrawingContext 2016-06-07 22:45:36 +01:00