1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Commit Graph

10448 Commits

Author SHA1 Message Date
OpenRCT2 git bot
397806af19 Merge Localisation/master into OpenRCT2/develop. 2017-01-05 04:00:15 +00:00
Michał Janiszewski
3a2f8a29d0 Disable MSVC 2017 RC on AppVeyor
I don't recall a build that would fail on MSVC15, but not on MSVC14.
Testing with both of them provides little benefit, while causing huge
delays in builds on AppVeyor.

In due time this can be re-enabled or AppVeyor setup can be moved fully
to MSVC15 when it becomes released.

Last known commit to pass is b1018ae.
2017-01-04 23:45:05 +00:00
Ted John
b1018aecb6 Merge pull request #4932 from IntelOrca/reorganise-src
Reorganise src/
2017-01-04 18:30:48 +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
Michał Janiszewski
6684851115 Fix MinGW builds 2017-01-04 18:28:39 +00:00
Michał Janiszewski
0d88276abe Fix tests for new source layout 2017-01-04 18:28:39 +00:00
Ted John
a2e3f10ca1 Update VS project files 2017-01-04 18:28:37 +00:00
Ted John
25bc798ff8 Move contents of src into project sub directory 2017-01-04 17:44:12 +00:00
Michał Janiszewski
67c2ab8849 Add libpng to required Linux libraries
[ci skip]
2017-01-04 16:12:35 +01:00
Michał Janiszewski
2f530c8ba2 Update required libraries for Linux
[ci skip]
2017-01-04 16:10:30 +01:00
Michał Janiszewski
fa51d15c34 Remove fontconfig from TTF-less configuration 2017-01-04 16:09:53 +01:00
Michał Janiszewski
360018a82b Merge pull request #4980 from janisozaur/ttf-less
Add configuration allowing builds without SDL2_ttf
2017-01-04 15:52:52 +01:00
Michał Janiszewski
02bcaabac2 Improve NO_TTF build 2017-01-04 13:51:49 +01:00
Michał Janiszewski
5214cb7223 Use TTF-less builds on Travis 2017-01-04 13:51:49 +01:00
Michał Janiszewski
34b8c2034e Allow building without SDL2_ttf 2017-01-04 13:51:49 +01:00
Ted John
73d1c6a1f0 Merge pull request #4971 from IntelOrca/refactor/mixer
Refactor mixer
2017-01-04 12:16:14 +00:00
Marijn van der Werf
d7fd3632dc Update Xcode project 2017-01-04 11:57:57 +01:00
OpenRCT2 git bot
b1b73a7745 Merge Localisation/master into OpenRCT2/develop. 2017-01-04 04:00:15 +00:00
Ted John
dbe694f7c8 Remove all usages of Uint types 2017-01-03 20:39:15 +00:00
Ted John
5ee43a26ac Create buffer type to reduce duplicated code 2017-01-03 20:38:46 +00:00
Ted John
c549fe0fba Rename mixer to AudioMixer 2017-01-03 20:15:02 +00:00
Ted John
f23d3c4e1c Refactor callback code 2017-01-03 19:53:36 +00:00
Ted John
983c59c9ff Refactor resampling code 2017-01-03 19:47:38 +00:00
Ted John
cb592726d9 Fix convert buffer, wrong allocation size 2017-01-03 19:27:35 +00:00
Michael Steenbeek
7312d81e17 Add constants for max stations per ride (#4979) 2017-01-03 16:25:17 +01:00
Ted John
a277419855 Use appropriate integer types 2017-01-03 12:43:34 +00:00
Ted John
683fc90ea7 Add cmath include to fix MacOS build 2017-01-02 23:36:09 +00:00
Marijn van der Werf
cfa1c62490 Add new files to Xcode project 2017-01-02 23:56:11 +01:00
Michał Janiszewski
2f7ee8460e Fix compilation with clang 2017-01-02 23:37:04 +01:00
Michał Janiszewski
e45301b104 Fix compilation with GCC 2017-01-02 23:36:56 +01:00
Ted John
fb37e57b96 Conform to naming conventions 2017-01-02 22:35:43 +00:00
Ted John
8b1590e248 Move AudioFormat to new header 2017-01-02 22:35:43 +00:00
Ted John
6ae1356af6 Move classes into their own source files 2017-01-02 22:35:43 +00:00
Ted John
1abafdc6a3 Rename audio sources 2017-01-02 22:35:43 +00:00
Ted John
ca7bbdfbcc Move Source to an interface 2017-01-02 22:35:43 +00:00
Ted John
6b2ad98a07 Move source implementations to mixer.cpp 2017-01-02 22:35:43 +00:00
Ted John
beb5fcb054 Extract resample code to new method 2017-01-02 22:35:43 +00:00
Ted John
cab4562950 Refactor resample code 2017-01-02 22:35:43 +00:00
Ted John
c70c80c8f4 Add underscores to class fields 2017-01-02 22:35:43 +00:00
Ted John
324dea94bc Make effect buffer lazy and dynamic 2017-01-02 22:35:43 +00:00
Ted John
7d16685d58 Re-use convert buffer 2017-01-02 22:35:43 +00:00
Ted John
2496c872d7 Refactor MixChannel more 2017-01-02 22:35:43 +00:00
Ted John
8c49bb8590 Move reading channel data to channel class 2017-01-02 22:35:43 +00:00
Ted John
46b4dbb4cb Make Channel an interface 2017-01-02 22:35:43 +00:00
Ted John
0d4531d10d Make Mixer an interface 2017-01-02 22:35:43 +00:00
Michał Janiszewski
a19b477c8e Fix compilation with ICC 2017-01-02 23:33:43 +01:00
Michał Janiszewski
8cb1460ca8 Fix undefined macro check in linux.c 2017-01-02 22:34:40 +01:00
Michał Janiszewski
cbef2c8a29 Constrain surfaceStyle value to valid range 2017-01-02 16:11:23 +00:00
Ted John
3e70ea9520 Update readme.md
Update building prerequisites for Windows.
[ci skip]
2017-01-02 00:36:04 +00:00