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

257 Commits

Author SHA1 Message Date
Richard Jenkins 2a3dda9838 Xcode fix 2017-06-11 17:23:52 +01:00
Gymnasiast 46ef794c28 Fix Xcode project 2017-06-10 19:50:11 +02:00
Richard Jenkins bd20c92a77 Update Xcode project compatibility to Xcode-8.0 2017-06-06 11:29:07 +02:00
Richard Jenkins 3d459693a2 Xcode fix 2017-06-04 00:18:26 +01:00
Richard Jenkins f469beacdb Xcode fix 2017-06-03 21:59:24 +01:00
Richard Jenkins 69feeafb3f Clean up Xcode project post-rebase 2017-05-29 22:38:46 +02:00
Richard Jenkins d4e5514f6b Tabs-to-spaces on UiContext.macOS.mm 2017-05-29 22:38:46 +02:00
Marijn van der Werf 90fbb29d93 Tidy up Xcode project 2017-05-29 22:38:45 +02:00
Richard Jenkins f7f5cb754b Add macOS target for CLI build 2017-05-29 22:38:45 +02:00
Richard Jenkins e8ec7ee58f Implement building of libopenrct2 and OpenRCT-UI for macOS 
Initial setup of xcode for multiple targets

libopenrct2 partially working

Restore macOS mach_info init

Get macOS OpenRCT2-ui working if hackish

Implement UiContext for macOS properly

Put tabbing cancellation code back
 2017-05-29 22:38:45 +02:00
Gymnasiast d4bb9c38c9 Delete unused file 2017-05-17 22:57:23 +02:00
Gymnasiast 09f0425c2f Unify River Rafts and Splash Boats drawing code 2017-05-17 20:49:07 +02:00
X123M3-256 dbfd898258 Correct sprite paths in project files 2017-05-07 01:01:07 +01:00
Richard Jenkins 6e443343a8 Update macOS deployment target to OS 10.8 2017-05-04 19:35:23 +01:00
Marijn van der Werf 6990762376 Update Xcode project 2017-05-04 17:29:05 +01:00
LRFLEW 3b21b521dd Update Xcode Project 2017-04-03 14:45:34 -05:00
Ted John 3f53f8cb5d Refactor duck to C++ 2017-03-23 17:37:25 +00:00
duncanspumpkin 5dbc82ab99 Apply cpp coding style 
Fix warning

Fix xcode

Use math min, use correct caseing for non windows

Fix more warnings

Fix warning
 2017-03-13 17:41:27 +00:00
LRFLEW d24961640a Update Xcode Project 
Fix warning

Fix warning
 2017-03-13 17:33:51 +00:00
Ted John bcc0bfa485 Rename climate.h to Climate.h 2017-03-11 22:59:33 +00:00
Ted John 0d722d55e1 Refactor climate to C++ 2017-03-11 22:59:32 +00:00
Ted John 7d33dda13b Fix xcode project 2017-03-11 12:57:46 +00:00
Marijn van der Werf 3bf14e0514 Update Xcode project 2017-03-09 14:57:14 +01:00
LRFLEW 8e55b6ef22 Make the INI keys case insensitive 2017-03-06 09:22:44 -06:00
Duncan 1654ba4fe4 Merge pull request #5236 from duncanspumpkin/refactor 
Refactor fence to wall
 2017-02-28 06:56:06 +00:00
LRFLEW e4b0ef428f Update Xcode Project (#13) 2017-02-23 12:07:42 +00:00
LRFLEW f4dfecf988 Update Xcode Project 2017-02-21 01:51:05 -06:00
Marijn van der Werf 0ebfc557fb Set Xcode C dialect to gnu11 2017-02-16 22:09:51 +01:00
LRFLEW 7dc9ad6cb3 Update Xcode Project 2017-02-12 23:00:06 +01:00
LRFLEW 6355ee6c4e Update Xcode Project 2017-02-12 10:42:16 +00:00
Ted John 591e81a0af Merge pull request #5157 from IntelOrca/fix/windows-tests-assert 
Allow control of assertion behaviour
 2017-02-10 18:18:49 +00:00
LRFLEW a15fd6c5f1 Update Xcode Project 2017-02-10 02:34:38 -06:00
danidoedel e7b9500bb6 Update Xcode project 2017-02-09 17:58:19 +00:00
Ted John e649e7ad4a Move creation of version string to Version.cpp 2017-02-09 17:58:19 +00:00
LRFLEW b1c7caf315 Update Xcode Project 2017-02-07 16:48:52 -06:00
danidoedel e5fbf5bfe4 Update Xcode project 2017-02-03 12:32:07 +00:00
danidoedel 0a2b63eced Update Xcode project 2017-02-01 11:32:49 +00:00
Marijn van der Werf d17c435c0e Update Xcode project 2017-01-22 20:57:17 +01:00
LRFLEW c70c1be3c1 Update Xcode Project 2017-01-21 19:09:03 -06:00
Ted John a7edba27aa Enable light FX in builds 2017-01-21 12:02:41 +00:00
Michael Steenbeek 1c2458b6dd Combine drawing of the Spiral and Mini RC (#5025) 2017-01-09 22:09:33 +01:00
danidoedel 4fdc0e674f Update Xcode project 2017-01-08 22:17:12 +00:00
Marijn van der Werf 24a0405345 Update testpaint 2017-01-04 18:28:40 +00:00
Marijn van der Werf 93f1eb7166 Update Xcode project 2017-01-04 18:28:40 +00:00
Marijn van der Werf d7fd3632dc Update Xcode project 2017-01-04 11:57:57 +01:00
Marijn van der Werf cfa1c62490 Add new files to Xcode project 2017-01-02 23:56:11 +01:00
Marijn van der Werf f1fbcbc90b Update Xcode project 2016-12-30 13:09:08 +01:00
Marijn van der Werf 56c338bd3a Update Xcode project 2016-12-28 23:09:04 +01:00
LRFLEW 066a9b12e2 Update Xcode Project 2016-12-16 16:11:03 -06:00
Marijn van der Werf 2bdef0d307 Embed libzip framework 2016-12-16 12:57:23 +01:00
Marijn van der Werf 3c77ee4f6d Update Xcode project 2016-12-16 12:34:45 +01:00
LRFLEW 767f950ede Update Xcode Project 2016-12-14 09:07:08 +00:00
Marijn van der Werf eb87baa5d8 Update Xcode project 2016-12-11 21:05:52 +01:00
Marijn van der Werf 4bc346df2f Update Xcode project 2016-12-01 16:03:16 +01:00
LRFLEW 5c6e0b550b Update Xcode Project 2016-12-01 16:03:16 +01:00
Ted John 5699b9e4ed Merge pull request #4685 from marijnvdwerf/fix/paint-5 
Combine Junior RC and Water RC drawing
 2016-10-25 12:14:03 +01:00
Marijn van der Werf 50bb158ee0 Update Xcode project 2016-10-23 14:16:56 +02:00
LRFLEW f489bba4f0 Update Xcode Project 2016-10-23 00:15:33 +01:00
Ted John 9118f24778 Rename FileEnumerator to FileScanner 2016-10-22 22:36:45 +01:00
Marijn van der Werf d05dfbe5dc Rename intercept2 to TestPaint 2016-10-17 16:06:05 +02:00
Marijn van der Werf 18d9b1e91e Don't use C for PaintIntercept functions 2016-10-17 12:45:27 +02:00
Marijn van der Werf d3ce7d1d75 Extract vertical tunnel testing 2016-10-17 12:45:27 +02:00
Marijn van der Werf 9efb41a13f Extract Side tunnels 2016-10-17 12:44:50 +02:00
Marijn van der Werf deb266c443 Extract SupportHeightCalls 2016-10-17 12:43:14 +02:00
Marijn van der Werf 334b8cca05 Extract all of `intercept.c` to C++ 2016-10-17 12:43:14 +02:00
Marijn van der Werf 28db02885d Extract function printing 2016-10-17 12:43:14 +02:00
Marijn van der Werf 6642dc534c Update Project files 2016-10-17 12:43:13 +02:00
Ted John d405e32c48 Merge pull request #4635 from LRFLEW/macos64 
Update Xcode Project to build x64 macOS Builds
 2016-10-17 07:59:08 +01:00
LRFLEW 0afc593fd3 Update Xcode Project to build x64 macOS Builds 2016-10-16 17:10:48 -05:00
LRFLEW 75f72f8687 Update Xcode Project 2016-10-15 21:50:52 +01:00
Marijn van der Werf 40dbb9db1f Fix typo in filename 2016-10-15 19:23:13 +02:00
LRFLEW 9b552ea6e2 Update Xcode Project 2016-10-11 23:18:28 +01:00
LRFLEW 9c1a6700d8 Update Xcode Project 2016-10-09 09:56:01 +01:00
LRFLEW 97cc97e0e8 Fix #3842: Version number not up to date 
Add Version Information to Info.plist for macOS
 2016-10-05 11:50:31 -05:00
Marijn van der Werf a27cebd973 Convert more occurences of osx to macos 2016-10-03 16:12:04 +02:00
Marijn van der Werf 741ce17e04 Update Xcode project 2016-09-24 11:21:04 +01:00
Marijn van der Werf 18a6d4246b Update scheme to Xcode 8 2016-09-16 19:49:16 +02:00
Marijn van der Werf 4e4a07d1b0 Update testpaint to match develop 2016-09-16 19:45:07 +02:00
Marijn van der Werf 52e4800660 Add rough version of support segment checking 2016-09-16 19:44:49 +02:00
Marijn van der Werf df202d86a6 Change folder structure 2016-09-16 19:44:40 +02:00
Marijn van der Werf d456d86f69 Add header for data.h 2016-09-16 19:44:35 +02:00
Marijn van der Werf ad2e8690bc Rename main.c to intercept.c 2016-09-16 19:44:31 +02:00
Marijn van der Werf b0a43861e4 Always use GTest output 2016-09-16 19:44:14 +02:00
Marijn van der Werf 2d70460332 Fix Xcode tests 2016-09-16 19:43:52 +02:00
Marijn van der Werf 6e274c6354 Add hooks 2016-09-16 19:42:55 +02:00
Marijn van der Werf 0935ac6ea9 Start drawing debug test 2016-09-16 19:42:53 +02:00
LRFLEW e07c374f2d Update Xcode Project for Xcode 8 2016-09-13 18:07:40 -05:00
Marijn van der Werf d3b7a0cbb9 Integrate addresses of old paint functions 2016-09-13 20:25:06 +01:00
Ted John fdc0010525 Remove List.hpp 2016-09-13 18:29:38 +01:00
Gert-Jan Vercauteren 66eed2b9a1 Added network code to xCode project 2016-08-29 17:13:20 +01:00
Marijn van der Werf 72cb30c7c4 Include topspin vehicle data 2016-08-19 18:59:23 +01:00
LRFLEW a320d4d596 Added Git Info for macOS Builds 2016-07-31 23:12:07 +02:00
LRFLEW d23a90f71a Added #4194 to Xcode Project 2016-07-31 19:02:09 +02:00
LRFLEW 1b157dbb31 Completely Remove DrawImageMaskedShader from XCode project 2016-07-27 04:01:25 +02:00
Alexander Overvoorde aab5180afb Remove DrawImageMaskedShader from XCode project 2016-07-27 04:01:25 +02:00
Marijn van der Werf dd756cb8be Add paint debug window 2016-07-26 10:55:47 +02:00
LRFLEW 287289b52f Update Xcode project 2016-07-16 00:03:46 +01:00
LRFLEW 50f3ba001e Update Xcode Project for #4024 2016-07-09 22:42:22 +01:00
LRFLEW bc01d91930 Updated Xcode Project for #3952 2016-07-01 22:02:28 +02:00
Marijn van der Werf 93480693e1 Sort files 2016-06-13 22:17:22 +02:00
Marijn van der Werf f568903eb2 Fix file properties and text settings 2016-06-13 20:26:50 +02: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
LRFLEW 3db558f236 Updated Xcode Project 2016-06-12 17:45:18 -05:00
Ted John e7e92f02c1 re-enable OpenGL 2016-06-10 17:54:29 +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
LRFLEW 26a07333b2 Update Xcode Project (#18) 2016-06-07 22:47:31 +01:00
LRFLEW 3a7ab9b20a Updated Xcode Project (#15) 2016-06-07 22:45:36 +01:00
LRFLEW 473d574a88 Updated Xcode Project (#14) 2016-06-02 09:46:01 +01:00
YJSoft 736b8787cf Add files to xcode project 
For OpenRCT2/OpenRCT2#3766
 2016-05-30 11:51:25 +01:00
Marijn van der Werf f08f2bef2c Add NetworkUser.cpp to Xcode project 2016-05-27 20:28:35 +02:00
Marijn van der Werf 5bc99d2006 Fix OS X project to include OpenSSL libraries 2016-05-27 20:28:34 +02:00
Michał Janiszewski 2627ddc836 Update URL to libs zip for OS X 2016-05-27 20:28:34 +02:00
Marijn van der Werf 46d0ef71e9 Re-enable building of g2.dat 2016-05-27 20:28:33 +02:00
Marijn van der Werf 50699de9b4 Update library paths 2016-05-27 20:28:33 +02:00
LRFLEW 5d5c10f99f Fixed OS X Build 2016-05-27 20:28:33 +02:00
YJSoft 31e8c9bbf9 Update project file with suggested changes 2016-05-27 20:28:33 +02:00
YJSoft b08efe7bda Add NetworkKey file and openssl ref. 
Also changing library sha256
 2016-05-27 20:28:33 +02:00
Marijn van der Werf 01f4ddd535 Move location of `.text` segment (#3711) 2016-05-23 16:23:31 +02:00
Marijn van der Werf 47840cb4b8 update xcode project 2016-05-08 22:35:12 +01:00
YJSoft db7f5cff81 add files at xcode project for #3477 2016-05-08 14:04:12 +01:00
Marijn van der Werf 19f53f01da Update Xcode project 
Readd missing spaces
 2016-05-05 21:41:59 +01:00
Marijn van der Werf e49cd101d3 Add `paint.c` 2016-05-04 18:54:40 +01:00
Marijn van der Werf c53d25922e Move surface painting to seperate file 2016-04-27 23:19:19 +02:00
Marijn van der Werf 54f2262fb2 Add files to Xcode project (#3392) 2016-04-22 21:12:56 +01:00
LRFLEW e71a918f65 Remanaged Xcode Project (#6) 
Fixes OS X compilation error
 2016-04-20 22:00:50 +01:00
IntelOrca 4b2776f266 move code from Diagnostics and Guard to cpp 2016-04-20 18:11:06 +01:00
LRFLEW ddedcf1d3b Removed Warnings present in Xcode (#3342) 2016-04-20 08:01:07 +01:00
Michał Janiszewski d59a010b00 Add new files to xcodeproj 2016-04-09 19:12:49 +02:00
YJSoft b694246fb5 #3121 add textinputbuffer source to xcode project 2016-03-10 18:48:02 +00:00
Marijn van der Werf 14bf53bb30 Add drawing_fast.cpp to project 2016-02-20 13:41:45 +00:00
LRFLEW 0b8567fa80 Updated Xcode Project for theme-refactor 2016-02-03 18:23:48 +00:00
Ted John 6eaa93c9bc Merge pull request #2783 from zsilencer/multiplayer 
MP groups and permissions
 2016-01-24 12:29:27 +00:00
Michał Janiszewski 8599468760 Cleanup unused lodepng stuff 2016-01-23 17:13:15 +01:00
LRFLEW 58d258038f Improve security on OSX and Linux 2016-01-22 16:44:08 -07:00
LRFLEW cfc3ec552c Added #2783 files to Xcode 2016-01-22 15:57:50 -07:00
LRFLEW 86baebd24b Updated Xcode project to link against zlib 2016-01-20 10:16:24 -07:00
LRFLEW 02c03d225c Added Path class to Xcode project 2016-01-12 23:10:19 +00:00
LRFLEW 7956922f26 Fixed branch new-argparse compilation on OS X 2016-01-10 22:50:53 +00:00
IntelOrca e9d222fdd3 new-argparse: finish new argparse integration and clean up 2016-01-10 22:50:31 +00:00
duncanspumpkin 2bd6dac20f Merge branch 'develop' into vehicle-update 
Conflicts:
 openrct2.vcxproj
 2016-01-10 08:57:41 +00:00
LRFLEW 3f714750ee Fixed first-launch "crash" issue on OS X 2016-01-09 18:29:20 -07:00
LRFLEW 8e74815200 Added ride/cable_lift.c to Xcode project 2016-01-09 15:58:25 -07:00
LRFLEW 106cf8d501 Removed loadpng from Xcode project to prevent building it 2016-01-08 23:40:14 -07:00
IntelOrca 0c933234e0 remove all tutorial code 2016-01-04 23:21:23 +00:00
LRFLEW d371fa603e Updated OS X shasum to new value 2016-01-04 11:07:36 -07:00
LRFLEW d2653e304d Added scenario_sources.c to Xcode 2016-01-02 23:14:50 +00:00
Miso Zmiric (Mike Squinter) 267750adfe disable versioned documents debugging 2015-12-31 02:15:26 +01:00
Miso Zmiric (Mike Squinter) 5522eedac2 make the main schema shared, allow for archive and export of Release app on build servers 2015-12-31 00:26:22 +01:00
LRFLEW ccd5329d4e Change SHA hashes for orctlibs-osx.zip 2015-12-30 16:08:53 -06:00