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

1322 Commits

Author SHA1 Message Date
Marijn van der Werf a53a7ab706 Convert remaining dialogs 2017-08-10 13:42:27 +02:00
Michał Janiszewski 1df22c889d Update minimum required CMake version to 3.1 2017-08-09 23:30:18 +02:00
Duncan 77330ac257 Fix #5890. Primary and secondary colours now work in zoomed opengl. (#6109) 
Mistake made due to a missunderstanding of how the software renderer works. At this point in the software renderer the primary and secondary colours are already calculated into the palette so can be ignored. In opengl the colours still need to be passed to the command queue. Fixes #4715 as well.

Update changelog
 2017-08-02 20:58:11 +01:00
Ted John 6699d0885b Merge pull request #6065 from IntelOrca/refactor/remove-rct2.c 
Move remaining functions out rct2.c
 2017-07-30 18:09:26 +01:00
Michał Janiszewski 9eb0dc6ea9 Fix wrong mouse button being released on FingerUp event 2017-07-30 17:57:07 +02:00
Michał Janiszewski eb76b188ae Ensure UiContext deletes allocated resources 2017-07-30 17:34:30 +02:00
Michał Janiszewski d5e6ab3111 Properly dispose of AudioMixer to plug memleak 2017-07-30 17:21:36 +02:00
Ted John 8b2eb8a13e Move screen variables to OpenRCT2.h 2017-07-29 20:29:29 +01:00
Ted John e6e503a853 Move path related functions to Context.cpp 
- rct2_init_directories
- get_file_path
 2017-07-29 20:29:26 +01:00
Ted John 8bc4e52ae9 Move rct2_quit to Context 2017-07-29 20:28:18 +01:00
Michał Janiszewski 70793f65a5 Verify queried renderer information 2017-07-28 08:06:11 +02:00
Kuriibo 59fabad37c Added new string for shortcut, validate_global_widx 2017-07-26 17:23:47 +01:00
Kuriibo d0db59e196 Keyboard Shortcut for Scenery Remover - #5835 
Added a hotkey for the "clear scenery" window. By default, the hotkey is the "b" key (b/c bulldozer).
 2017-07-26 17:23:47 +01:00
ZehMatt fabf7f9fb5 Refactored window flags only being updated every 1000ms. 2017-07-25 08:33:57 +02:00
Ted John bc88cb9c2b Make TitleScreen a class (#5971) 2017-07-22 23:42:14 +01:00
Ted John 01b0047675 Invert Painter dependency 
Make painter call into the drawing engine, rather than the drawing engine create and call the painter.
 2017-07-16 23:25:11 +01:00
Ted John cb884dad11 Refactor rct2_draw to a new Painter class 
Right now this is created for each drawing engine, but should eventually be a dependency into them.
 2017-07-16 23:25:11 +01:00
Ted John 7fbcf1ab0b Move rct2_update into Context 2017-07-16 23:25:11 +01:00
Sjors Gielen 553e16144b Fix null pointer dereference when cancelling an RCT1 location dialog on Mac OS X. 
To reproduce, run openrct2 on OSX, go to the options dialog, then to the bottom
of the misc tab, select an RCT1 location. Then, cancel that dialog. This would
trigger a null pointer dereference by returning std::string(nullptr).
 2017-07-14 13:33:54 +02:00
Ted John a808da910c Merge pull request #5885 from willox/gltransparency 
Fix regression in OpenGL DrawImageCommand flags
 2017-07-13 19:17:59 +01:00
William Wallace ae110a9159 Allow switching between OpenGL and other renderers without restarting 2017-07-13 19:04:37 +01:00
William Wallace ab39262ccf Remove incorrect/unnecessary OpenGL API calls 2017-07-13 19:04:37 +01:00
William Wallace fbb424ba21 Add enums for DrawImageInstance flags 2017-07-13 18:10:14 +01:00
William Wallace 110d01f863 Fix regression in OpenGL DrawImageCommand flags 
Flag 1 isn't supposed to be set when flag 3 is set.
 2017-07-13 15:42:46 +01:00
ZehM4tt 5f1bc914af Fix copying commands to draw image instances. 2017-07-13 10:17:23 +02:00
Duncan 7b47438f49 Fix windows x86 debug builds (#5845) 2017-07-09 09:51:02 +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
Michael Steenbeek 44af1653a6 Replace 'center' with 'centre' (#5745) 2017-06-30 23:11:28 +01:00
Ted John 9b2777bc56 Fix read keyboard config error 
Do not try to read more keyboard shortcuts than there actually are.
 2017-06-30 19:11:32 +01:00
Ted John 659ccc03d0 Merge pull request #5740 from OpenRCT2/bugfixes 
Fix chat sounds
 2017-06-30 00:22:53 +01:00
zsilencer 2385ef1059 Fix incorrect arguments to resampler. 2017-06-29 16:40:00 -06:00
zsilencer bde3197e79 Fix incorrect resampling rate when at the end of a sound. 2017-06-29 15:43:40 -06:00
Michał Janiszewski 5a20ab2ffe Add missing newline in input.c 
[ci skip]
 2017-06-29 23:21:31 +02:00
David CARLIER 04ed2d78d2 Fix building on FreeBSD 2017-06-27 08:56:03 +02:00
Brian Callahan fe8f949b3f Add OpenBSD support. 2017-06-25 23:25:46 +02:00
Ted John f275e5ba9b Remove all platform.h includes from header files 
System headers, particularly windows.h polute the namespace too much with macros and unwanted definitions. Do not use them in header files.
 2017-06-25 18:59:56 +01:00
Ted John acf3b0cf83 Only include FindPkgConfig once 2017-06-25 14:28:25 +01:00
Ted John 89d43c1120 Merge pull request #5702 from IntelOrca/refactor/nosdl/freetype2 
Remove SDL2_ttf dependency, replace with some code form SDL2_ttf without SDL2 dependencies and instead only requiring freetype alone.
 2017-06-25 11:35:06 +01:00
wolfreak99 c80e782e67 Add default shortcut 2017-06-24 19:01:00 +02:00
wolfreak99 8364d8d3d8 Implement load game shortcut 2017-06-24 19:01:00 +02:00
Ted John 2c07a55696 Refactor TTF into new source and remove SDL2_ttf 2017-06-24 14:50:30 +01:00
Michael Steenbeek 1f00469b26 Replace free+null with SafeFree, allow freeing NULL 
free(NULL) is perfectly fine, no need to check
 2017-06-22 12:49:33 +02:00
Michael Steenbeek 9c3a16b6e0 Merge pull request #5611 from OpenRCT2/android 
Android
 2017-06-19 10:25:18 +02:00
Michał Janiszewski 9903c15e2a Remove various trailing whitespaces 
[ci skip]
 2017-06-17 13:41:40 +02:00
Marijn van der Werf 8766ec37a1 Add Android project 2017-06-15 14:22:15 +02:00
Ted John 1dae7f9f32 Move SDL_LoadBMP call to libopenrct2ui (#5616) 2017-06-14 19:47:22 +01:00
Ted John fda2f38097 Merge pull request #5589 from duncanspumpkin/remove_win32_debug 
Remove Win32 debug special builds as they no longer work and we will soon be removing RCT2 interop entirely.
 2017-06-14 07:45:15 +01:00
Ted John 20197d50c3 Fix #5595: No longer able to navigate map diagonally using arrow keys 2017-06-13 17:20:50 +01:00
duncanspumpkin e70a96c04f Remove Win32 debug special builds 
Win32 debug previously built a special .dll build to allow calling into RCT2. This has been broken for a while and has little use anymore. It has therefore been removed.
 2017-06-13 12:23:26 +01:00
Ted John ee7c97b7be Move scancode to key to openrct2ui 2017-06-11 23:22:32 +01:00
Ted John 31c2b9c6b7 Move remaining SDL in input.c to openrct2ui 2017-06-11 21:18:56 +01:00
Ted John 3988b7797e Fix display of chat shortcut on network games (#5593) 2017-06-11 18:19:15 +01:00
Ted John 7a86fc2cb5 Link back shortcut functions 
Some of this will be temporary until input and windows move over to libopenrct2ui.
 2017-06-11 17:23:52 +01:00
Ted John 524248cfec Fix libopenrct2ui.vcxproj 2017-06-11 17:23:52 +01:00
Ted John 89ea9064de Move things in keyboard_shortcut.h into KeyboardShortcuts.h 2017-06-11 17:23:51 +01:00
Ted John cbd53f920c Create IWindowManager to open window from libopenrct2 2017-06-11 17:23:51 +01:00
Ted John dfa1b47a4f Move keyboard shortcut code to libopenrct2ui. 2017-06-11 16:52:15 +01:00
Ted John 0d8f9d6618 Refactor IPlatformEnvironment (#5590) 2017-06-11 12:53:37 +01:00
Ted John 5bb48f3539 Move SDL part of lightfx blend to drawing engine 2017-06-10 22:18:54 +01:00
Ted John 90aad2e2ec Use rct_palette instead of SDL 2017-06-10 22:18:54 +01:00
Ted John fc899d15ef Remove SDL_Window from IDrawingEngine and UiContext 2017-06-10 22:18:54 +01:00
Ted John b32f0b276d Merge pull request #5574 from IntelOrca/fix/screenshot 
Fix screenshot command and refactor drawing engine
 2017-06-10 20:06:26 +01:00
Ted John 47e6f1d139 Rename our version of SDL_MIX_MAXVOLUME to MIXER_VOLUME_MAX 
Keep an assert to make sure its the same as SDL in the mixer. If SDL changes it, we can either change ours or convert the number proportionally.
 2017-06-10 17:14:07 +01:00
Ted John abb857e51d Remove platform_get_non_window_flags 2017-06-10 16:40:08 +01:00
Ted John 97d68957f0 Fix segfault in screenshot command 2017-06-10 15:48:05 +01:00
Ted John 0ad2c075e5 Separate hardware display drawing engine from software 2017-06-10 15:48:05 +01:00
Ted John df16e6a4f7 Inherit X8 engine from software engine 2017-06-10 15:48:04 +01:00
Richard Jenkins 60a633e79b Fix #5571: Crash when deleting text at end of line (#5572) 2017-06-08 19:17:43 +01:00
Michał Janiszewski 61d38511bc Expand tabs to spaces 
This commit expands tabs to spaces (ts=4) in all the files under src/
and test/.

Until now we had two wildly different code styles with C using tabs and
new C++ using spaces. It is painful to maintain as none of the commonly
used tools support this kind of setup and in reality is needless, as we
can simply convert all the sources to spaces and have opened PRs do the
same, where needed.

Additionally, trailing whitespace has been removed.
 2017-06-06 23:46:14 +02:00
Ted John 94e982289e Fix openrct2-cli build 
By using a dummy audio context, we can now make openrct2-cli start a headless instance without any SDL2 calls. SDL2 is still a dependency until we remove out the input code to openrct2-ui.
 2017-06-04 00:18:26 +01:00
Ted John af91b9f4b4 Fix #5521: Infinite loop on first run if neither Zenity nor kdialog are installed (#5526) 2017-06-03 22:13:20 +01:00
Ted John e048f52738 Fix #5537: SDL_Init(SDL_INIT_VIDEO) is called even when using --headless option 
Create a dummy UI context and use that if headless is enabled. Some extra guards added to deal with the return values from the dummy class. It may be temporary until the window and input code is moved to openrct2ui.
 2017-06-02 19:08:03 +01:00
Ted John 852ea898e7 Fix #5534: Unable to select any full screen resolutions 2017-06-02 18:36:21 +01:00
Michał Janiszewski 79d76759bb Fix #5516: Update copyrights for 2017 
Not all files were necessarily _changed_, but all were touched, see
https://github.com/OpenRCT2/OpenRCT2/pull/4932
 2017-06-01 21:55:10 +02:00
Richard Jenkins 25e50bf43c Set CMAKE_INSTALL_RPATH before adding executables. 2017-05-31 19:39:38 +01:00
Ted John 1e550e9059 Create portable builds 
Which set rpath to $ORIGIN so it can be run out the box.
 2017-05-31 08:51:51 +01:00
Ted John 3ca1b48384 Open the game window on the last remembered display 2017-05-29 22:39:17 +02:00
Ted John 4932537a91 Fix kdialog implementation 2017-05-29 22:38:46 +02:00
Ted John a15a226d7a Fix zenity dialog logic 2017-05-29 22:38:46 +02:00
Ted John e313568a27 Initialise UiContext input fields 
This was causing undefined data to appear in _keysPressed which caused shortcuts to be invoked on startup.
 2017-05-29 22:38:46 +02:00
Richard Jenkins 7a59eef47e Fix cmake for OpenRCT2-UI on macOS 2017-05-29 22:38:46 +02:00
Ted John f998172674 Fix IME text input 2017-05-29 22:38:46 +02:00
Ted John 3ebf5be3ea Fix mingw cmake 2017-05-29 22:38:46 +02:00
Richard Jenkins e54bed73c6 Remove stray spaces in header 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
Richard Jenkins aa5151503a Fix formatting 2017-05-29 22:38:46 +02:00
Richard Jenkins 999a467b9a Add SetKeysPressed() function to UiContext 2017-05-29 22:38:46 +02:00
Richard Jenkins 898ffdb8e0 Fix #5487: Crash on deleting text 2017-05-29 22:38:46 +02:00
Marijn van der Werf 52552a9dc4 Work on fixing openrct2-gui compilation 2017-05-29 22:38:45 +02:00
Ted John ee9aa55083 Fix more warnings 2017-05-29 22:38:45 +02:00
Richard Jenkins 63771389c3 Remove whitespace in UiContext.cpp 2017-05-29 22:38:45 +02:00
Richard Jenkins c71fc2b542 Remove test code 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
Ted John 3fa764321e Fix string errors and warnings 2017-05-29 22:38:45 +02:00
Ted John f1a8b32db4 Prevent SDL_INIT when the game does not need to launch 2017-05-29 22:38:45 +02:00
Ted John 41f376f7aa Add final to implementations 2017-05-29 22:38:44 +02:00
Ted John 98d59ccaa3 Fix Linux build errors 2017-05-29 22:38:44 +02:00
Ted John e133585727 Fix 32-bit build 2017-05-29 22:38:44 +02:00
Ted John 50197f04ed Fix boolean warning 2017-05-29 22:38:44 +02:00
Ted John e2a7189663 Do not use SDL_Colour for gPalette 2017-05-29 22:38:44 +02:00
Ted John cf0dcb4753 Refactor file / directory dialogs to UiContext 2017-05-29 22:38:43 +02:00
Ted John 3fcd42fe2b Move more window code to UiContext 2017-05-29 22:38:43 +02:00
Ted John a020a9fbef Fix premature deletion of platform context 2017-05-29 22:38:43 +02:00
Ted John 0440c3deea Clean up audio.cpp 2017-05-29 22:38:43 +02:00
Ted John e426c70bbc Get moved audio code linking 2017-05-29 22:38:43 +02:00
Ted John d206d181f2 Move audio code to UI project 2017-05-29 22:38:43 +02:00
Ted John 175606ae52 Create new audio context interface 2017-05-29 22:38:43 +02:00
Ted John bd9839ff50 Get the game working 
Mostly just needed to resolve screen size which is now retrieved via ui context.
 2017-05-29 22:38:43 +02:00
Ted John 7163973bd2 Start moving code from OpenRCT2 to Context 2017-05-29 22:38:42 +02:00
Ted John 9d24e47e6f Fix build 2017-05-29 22:38:42 +02:00
Ted John f736e8ff96 Move more platform code to UiContext 2017-05-29 22:38:42 +02:00
Ted John 5885cb646f Start moving window logic to UI project 2017-05-29 22:38:42 +02:00
Ted John 10182879da Invert Context and UiContext dependencies 2017-05-29 22:38:42 +02:00
Ted John 06bba09b43 Fix various issues with the cmake projects 2017-05-29 22:38:42 +02:00
Ted John c7b1feea07 Add back most of the cmake options 2017-05-29 22:38:42 +02:00
Ted John 89780363ee Add openrct2-ui cmake project 2017-05-29 22:38:42 +02:00
Ted John 5c59b743fd Add new CLI and UI builds for non Windows platforms 2017-05-29 22:38:42 +02:00
Ted John 006a76c099 Refactor registration of drawing engines 2017-05-29 22:38:42 +02:00
Ted John bf3749833d Allow drawing engine registration via context interfaces 2017-05-29 22:38:42 +02:00
Ted John c7b66ab193 Fix includes for moved files 2017-05-29 22:38:41 +02:00
Ted John 19aafc4e24 Move drawing engine implementation code to openrct2-ui 2017-05-29 22:38:41 +02:00
Ted John 9c904db1c3 Add UI src project 2017-05-29 22:38:41 +02:00