mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity
7,928 Commits 8 Branches 59 Tags
cdab4bc0fd430256373cebb2cc3b8f2bdfe0686d
Commit Graph

7928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michał Janiszewski
cdab4bc0fd Add CMake target not using RCT2, use it for linux64 job 2016-06-16 11:37:52 +02:00
Michał Janiszewski
3d4eceb5ca Fix rebase 2016-06-16 11:36:15 +02:00
Ted John
ad1b9265dc integrate variables for various drawing pointers 2016-06-16 11:36:15 +02:00
Michał Janiszewski
a5c119ba60 Load assets properly for 32 bit builds 2016-06-16 11:36:15 +02:00
Ted John
b73861be99 integrate variable: g1Elements 2016-06-16 11:36:15 +02:00
Ted John
d07b9535c2 integrate variables: object entry lists 2016-06-16 11:36:15 +02:00
OpenRCT2 git bot
7c9f59f1c5 Merge Localisation/master into OpenRCT2/develop. 2016-06-16 04:00:17 +00:00
duncanspumpkin
31812a08a5 Remove hooks. All string code now implemented 2016-06-15 19:11:51 +01:00
Ted John
19cd56b9c2 Add Shader Palette Lookup 2016-06-15 17:53:26 +01:00
Ted John
d0dead085a Merge pull request #3873 from marijnvdwerf/macos 
Clean up Xcode project
 2016-06-15 12:17:05 +01:00
Duncan
f339bd6e7a Merge pull request #3465 from marijnvdwerf/paint-setup/path 
Path paint
 2016-06-15 07:10:55 +01:00
Marijn van der Werf
1b2de3676b Merge pull request #4 from duncanspumpkin/path 
Refactor
 2016-06-15 07:33:55 +02:00
OpenRCT2 git bot
a9f950c6c8 Merge Localisation/master into OpenRCT2/develop. 2016-06-15 04:00:19 +00:00
duncanspumpkin
0bdff0af63 Refactor 2016-06-14 20:33:56 +01:00
Marijn van der Werf
0424e88d9d Update distribution readme 2016-06-14 13:10:13 +02:00
LucaRed
fc789011f0 "Hide" instead of "Remove" in view options (#3876) 
Use "hide" instead of "remove" for view options, given it's not actually editing the map. See OpenRCT2/Localisation#748
 2016-06-14 11:15:36 +02:00
Yaroslav Tretyakov
a5bf11ce86 Fix #3859: Scenery bounding box incorrect (#3874) 2016-06-14 08:02:59 +01:00
OpenRCT2 git bot
bd038c63b2 Merge Localisation/master into OpenRCT2/develop. 2016-06-14 04:00:17 +00:00
Marijn van der Werf
bd8f89bedb Make readme more generic regarding Macs 2016-06-14 02:09:33 +02: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
Marijn van der Werf
93480693e1 Sort files 2016-06-13 22:17:22 +02:00
Ted John
602d84156c fix #3856: Save Game causes Crash 2016-06-13 19:39:11 +01:00
Marijn van der Werf
1773fa1a19 Make build status more generic 2016-06-13 20:27:40 +02:00
Marijn van der Werf
f568903eb2 Fix file properties and text settings 2016-06-13 20:26:50 +02: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
Marijn van der Werf
e7e9cbd337 Fix group paths 2016-06-13 19:55:17 +02:00
Marijn van der Werf
42ee299f65 Replace references to OS X 2016-06-13 19:49:06 +02: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
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