mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 15:24:30 +01:00
Code Issues Releases Wiki Activity
11,962 Commits 8 Branches 59 Tags
44af1653a6762bb08ca0795b34b79ebfd996e486
Commit Graph

95 Commits

Author SHA1 Message Date
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