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

340 Commits

Author SHA1 Message Date
Michael Steenbeek 3882715c38 Fix Xcode project 2018-01-05 23:04:52 +01:00
Michael Steenbeek c2fe90c573 Fix Xcode project 2018-01-05 22:47:35 +01:00
Michael Steenbeek 6450cce829 Fix compilation on Xcode 2018-01-05 19:58:05 +01:00
Michael Steenbeek 91589f57c6 Compile map.c as C++ 2018-01-03 20:40:51 +01:00
Richard Jenkins 3ab3003e7b Xcode fix 2018-01-03 15:07:17 +01:00
Michael Steenbeek 347ff702d0 Refactor objects 2018-01-03 10:16:51 +01:00
Marijn van der Werf ab716f60b2 Update Xcode project 2018-01-01 23:49:09 +01:00
Michael Steenbeek 400993c8cb Fix Xcode project 2018-01-01 23:49:09 +01:00
Gymnasiast 1626f86acc Compile park.c as C++ 2018-01-01 01:18:12 +01:00
Michael Steenbeek 341e3a5d9d Fix Xcode project 2017-12-31 20:43:17 +01:00
Michael Steenbeek c4f44e5e7a Compile files in paint folder as C++ 2017-12-17 17:24:36 +01:00
Marijn van der Werf 841fa44fc8 Update Xcode project 2017-12-16 15:47:38 +02:00
Michael Steenbeek 1a9975d683 Compile util and cheats as C++ 2017-12-14 10:03:21 +01:00
ZehMatt 6787e6ca04 Rename surface.c to Surface.cpp. 2017-12-13 12:00:45 +01:00
Michael Steenbeek 6dc49d643a Compile files in base dir as C++ 2017-12-13 08:03:48 +01:00
Marijn van der Werf 0fe3b841e9 Update Xcode project 2017-12-07 17:52:03 +01:00
Michael Steenbeek 0ffa2b541a Use more consistent terminology and remove some Americanisms 2017-12-05 10:23:36 +01:00
Michael Steenbeek 60d8865efb Compile game.c and game.h as C++ 2017-12-05 09:10:27 +01:00
Michael Steenbeek 7558ade6a1 Fix Xcode project 2017-12-04 19:04:07 +00:00
Ted John 99d7aaa2d6 Remove RCT2 interop 2017-12-04 19:04:06 +00:00
Michael Steenbeek 3dfb4214f3 Fix Xcode project 2017-12-01 21:09:52 +00:00
Marijn van der Werf 2ce115ce3c Update Xcode project 2017-11-23 23:12:25 +01:00
Michael Steenbeek dd8464f907 Refactor small, large and wall scenery 2017-11-20 14:40:56 +01:00
Michael Steenbeek a050c6944f Compile money_effect.c as C++ 2017-11-20 14:27:32 +01:00
Michael Steenbeek ec0f672e71 Compile particle.c as C++ 2017-11-20 14:27:32 +01:00
Michael Steenbeek 005ce63a0f Compile tile_inspector.c as C++ 2017-11-20 14:27:32 +01:00
Michael Steenbeek ed05d45072 Clean up ride groups and related functions 2017-11-20 13:40:03 +01:00
Michael Steenbeek bf69b2e682 Make terminology use more consistent 2017-11-20 11:20:04 +01:00
Marijn van der Werf 67ebf40f83 Move main editor window to UI project 2017-11-18 21:07:21 +01:00
Marijn van der Werf dceb403ca9 Move editor bottom toolbar to UI module 2017-11-18 21:07:21 +01:00
Marijn van der Werf 8b7322ad6e Move bottom toolbar to UI module 2017-11-18 21:07:21 +01:00
Marijn van der Werf 3d7867791d Move scenery window to UI module 2017-11-18 21:07:21 +01:00
Michael Steenbeek a292917e50
Compile mapgen.c as C++ 2017-11-17 10:22:54 +01:00
Michael Steenbeek 263b7537d7 Fix crash when removing scenery groups 2017-11-13 10:30:34 +01:00
Marijn van der Werf bd0bd9e038 Move top toolbar to UI module 2017-11-11 23:57:19 +01:00
Marijn van der Werf c247bbcb82 Move ride construction window to UI module 2017-11-11 23:57:19 +01:00
Marijn van der Werf 75e5f44717 Update Xcode project 2017-11-11 23:57:19 +01:00
Ted John d3692dfb7a Add Date class 
To eventually replace passing around month ticks and date.c
 2017-11-10 19:32:32 +01:00
Marijn van der Werf ee2f04864f Update Xcode project 2017-11-03 01:54:37 +01:00
Marijn van der Werf 4a4f9648a7 Move network status window to UI module 2017-11-03 01:54:37 +01:00
Michael Steenbeek ce8d9cc71b Rename map_element to tile_element 2017-10-31 19:59:06 +01:00
LRFLEW 778cb9d024 Rename CopyFramebufferShader to ApplyPaletteShader 2017-10-30 16:21:49 +01:00
LRFLEW 50600f6195 Move MaxTransparencyDepth 2017-10-30 16:21:49 +01:00
LRFLEW d3d41ea724 OpenGL: Add single-pass transparency 2017-10-30 16:21:49 +01:00
LRFLEW 6bf2e0157b OpenGL: Improve Shaders 2017-10-30 16:21:49 +01:00
Marijn van der Werf fb7f97d360 Update Xcode project 2017-10-30 12:06:05 +01:00
Michael Steenbeek 2692e98434 Fix Xcode project 2017-10-25 23:53:47 +02:00
Michael Steenbeek b9e4d06d07 Compile cable_lift.c as C++ 2017-10-24 09:39:40 +02:00
Michael Steenbeek ce4899c60c Compile station.c as C++ 2017-10-23 14:47:12 +02:00
Michael Steenbeek 79365b7a91 Merge pull request #6075 from marijnvdwerf/ui/text-paint 
Refactor text painting
 2017-10-18 07:49:13 +02:00
Michael Steenbeek bb01699b7d Compile track.c as C++ 2017-10-17 13:51:47 +02:00
Michael Steenbeek 42ee2638f6 Fix Xcode project 2017-10-15 22:07:47 +02:00
Marijn van der Werf e2de6d79fe Update Xcode project 2017-10-14 23:38:51 +02:00
Michał Janiszewski ab3835719a Compile peep and staff logic as C++ 2017-10-13 10:06:36 +02:00
Michael Steenbeek 42d6a10952 Compile management as C++ 2017-10-11 21:38:26 +02:00
Michael Steenbeek 34200848a9 Fix Xcode project; rename input.h 2017-10-11 11:30:38 +02:00
LRFLEW 0868902f11 Rework OpenGL API declarations 2017-10-10 22:26:35 +02:00
Michael Steenbeek f9c2d16eb0 Rename ride paint header files 2017-10-09 15:24:24 +02:00
Michael Steenbeek 868eb16060 Fix Xcode project 2017-10-09 15:24:23 +02:00
Marijn van der Werf ebb4bbe5d5 Move ride list window to UI module (#6412) 2017-10-08 22:15:41 +02:00
Marijn van der Werf 2d99367159 Update Xcode project 2017-10-07 22:24:14 +02:00
Michael Steenbeek 31e1ad43a8 Compile finance.c as C++, clean up 2017-10-07 16:28:35 +02:00
Michael Steenbeek 25b72260d7 Compile research.cpp as C++, small refactor 2017-10-06 21:41:50 +02:00
Marijn van der Werf eba0054c0b Update Xcode project 2017-10-05 10:42:44 +02:00
Marijn van der Werf 4b1a27bb4f Update Xcode project 2017-10-05 10:42:39 +02:00
ZehMatt 5f076e8103 Compile paint code as cpp. 
Style fixes.
 2017-10-02 21:42:11 +02:00
Marijn van der Werf 9ae887bf97 Update Xcode project 2017-09-24 22:41:49 +02:00
Michael Steenbeek 1fd1d8c26b Move editor to C++; add defines for object limits 2017-09-22 07:56:24 +02:00
Michael Steenbeek ddb557a0fe Fix TD4 vehicle colour import, move track_design to C++ 2017-09-01 13:38:21 +02:00
Marijn van der Werf 294cef3c9b Move additional windows to UI project 2017-08-14 23:53:28 +02:00
Marijn van der Werf 7bd63609bb Update Xcode project 2017-08-10 13:42:27 +02:00
Marijn van der Werf 8ae17867b2 Update Xcode project 2017-08-10 13:42:27 +02:00
Richard Jenkins 972120e35a Fix #6106: Changelog file cannot be loaded on macOS 2017-08-08 00:10:42 +02:00
Marijn van der Werf c1598c269c Update Xcode project 2017-08-04 18:12:54 +02:00
Gymnasiast ca77c75a56 Improve tabs, alignment, remove now-unnecessary information and strings 
Removes RCT2 version string, Infogrames credits and logo, removes strings for aforementioned info.
Moves OpenRCT2 version string to under the Changelog... button, rewords and fixes some of the strings
 2017-08-04 08:41:46 +02:00
Richard Jenkins 2782c49a1e Xcode fix 2017-07-30 13:16:06 +01:00
Duncan 9a49490a0a Refactor of scenery elements (#5308) 
Label scenery flags, vars and refactor small scenery into cpp file.
 2017-07-25 22:26:43 +01:00
Gymnasiast 7222318de3 Add Painter.cpp and Painter.h to Xcode project 2017-07-16 23:25:11 +01:00
Ted John 3545d2d635 Update to 0.1.0 title sequence 2017-07-07 17:35:33 +01:00
rwjuk 214bf3988b Implement 'missing objects' window 
Implement 'missing objects' window

Basic implementation of 'bad objects' window

Add new object_load_error.c

Add object_load_error.c

Faffing about

String stuff

Stuff

Get window basically displaying

Proper col header for object

Display object types

Display file name and explanatory message

Probably about time I added myself to the dev list

Cleanup and comments

Make bad object window work with SC6

Fix whitespace, string IDs, flip core function sense

Fix spacing in string_ids.h

Fix string ID snafu

Fix HasNoInvalidObjects() sense

Attempt to refactor this to pass data properly

Move typedefs to separate header

Fix up signatures

Add park_load_result_types.h

Clean up includes and remnants of prev implementation

Split duplication into function, free invalid entries list on close

Use pointer for object_validity_result param

Fixup string IDs

Use LoadObject() directly

Use dependency injection, fix string termination

Xcode fix, make helper function static

Fix buffer overrun and memory leak

Use SDL for clipboard functionality

Fix function & variable declarations

Rework editor_read_s6() to use new park load result type

Update changelog for #5624

[ci skip]

Fix mem leak, function signature and whitespace
 2017-07-01 01:28:51 +01:00
Marijn van der Werf 87e73d160e Update Xcode project 2017-06-25 11:56:17 +02:00
Ted John be71553a14 Update xcode dependencies 2017-06-25 10:30:55 +01:00
Gymnasiast 1836515e3e Add files to Xcode project 2017-06-25 11:25:27 +02:00
Michael Steenbeek fef10c1f60 Clean up windows using land tools 2017-06-22 20:49:13 +02:00
LRFLEW e9e2b79f1c Update Xcode Project 2017-06-19 12:37:50 +02:00
Michael Steenbeek 96a7a8ab50 Sort rides into ride groups when in select-by-track-type mode 
* Add ride groups

* Convert ride groups to C++

* Fix linking and crashes in Xcode

* Comment out .field syntax to make Visual Studio happy

* Fix alignment, fix changelog, cleanup

* Properly save ride group index in the ride object repository and bump its version

* Fix fallback behaviour when the ride entry is not available or not invented

* Fix include

* Rename RideGroup to RideGroupManager, add const, cleanup

* Break after finding matching ride group
 2017-06-14 13:31:27 +02:00
Gymnasiast fb807dedb9 Use spaces in the Xcode project, fixes #5565 2017-06-13 11:12:31 +02:00
Richard Jenkins 006d6b7209 Xcode fix 2017-06-11 22:15:01 +01:00
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