Ted John
a24b3e114c
Merge pull request #2107 from Dandandan/optimizemixer
...
Optimize Mixer::EffectPanS16
2015-10-23 13:28:40 +01:00
Daniël Heres
fdbd08e306
Calculate correct d_left / d_right
2015-10-23 14:06:38 +02:00
Duncan
2e64527771
Merge pull request #2105 from janisozaur/at-and-t
...
AT&T
2015-10-23 12:47:59 +01:00
Daniël Heres
831dc631c8
Optimize Mixer::EffectPanS16
2015-10-23 12:40:35 +02:00
Daniël Heres
b33a8fc101
Merge remote-tracking branch 'refs/remotes/OpenRCT2/develop' into develop
2015-10-23 12:39:31 +02:00
Ted John
a88f418036
Merge pull request #2106 from smiley/patch-1
...
README.md: Fix broken section link
2015-10-23 09:44:07 +01:00
Smiley Barry
ded8e40bab
Fix broken section link
2015-10-23 10:56:51 +03:00
Michał Janiszewski
12d9278e1e
Use 'trusty' image for travis now that it's public
...
Travis CI team has recently published beta image of Trusty for testing
[1]. Switch to that image for CI builds in a non-hacky way.
[1] http://blog.travis-ci.com/2015-10-14-opening-up-ubuntu-trusty-beta/
2015-10-23 00:04:19 +02:00
Michał Janiszewski
5bc180a583
Fixes for travis builds of new AT&T syntax
2015-10-22 23:59:10 +02:00
Michał Janiszewski
ff19998846
Add clang to travis matrix
2015-10-22 23:54:07 +02:00
Michał Janiszewski
11fb15bba7
Add casts for types
2015-10-22 23:51:05 +02:00
Michał Janiszewski
f8407176d1
drop no longer needed debug switch for gcc
2015-10-22 23:39:09 +02:00
Michał Janiszewski
10587cb5ab
Port non-VS inline asm to AT&T syntax
...
This is much more liked by other compilers
2015-10-22 23:32:27 +02:00
Ted John
5b57a55094
Merge pull request #2102 from janisozaur/asm
...
Modify inline assembly to properly returns results
2015-10-22 19:28:57 +01:00
Michał Janiszewski
18c867a6fe
Modify inline assembly to properly returns results
...
Both RCT2_CALLFUNC_X and RCT2_CALLPROC_X did not really return any
value, even though declared to return an int. The inlines are now
modified to properly return flags (`lahf`), with other contents zeroed
out.
2015-10-22 20:23:26 +02:00
Ted John
bf17ae2e46
Merge pull request #2103 from janisozaur/develop
...
Add myself to contributor list
2015-10-22 19:00:53 +01:00
Michał Janiszewski
cd60c35417
Add myself to contributor list
2015-10-22 19:55:03 +02:00
Ted John
6a33b92725
Merge pull request #2101 from nightroan/develop
...
Opening or testing a ride will only that ride's close construction window
2015-10-22 09:48:10 +01:00
Ted John
8c8df3eaa0
Merge pull request #2100 from janisozaur/develop
...
Use const for parameters
2015-10-22 09:42:49 +01:00
nightroan
2e52fac0ca
Testing or opening a ride only closes the construction window for that ride.
2015-10-22 01:27:39 -07:00
Michał Janiszewski
06b13794ea
Use const for parameters
...
In profiling, gfx_rle_sprite_to_buffer turns out to be a hot spot. Use
const pointers, so compiler can make more assumptions regarding them and
perhaps optimize more heavily.
2015-10-22 10:15:45 +02:00
IntelOrca
67cf1495e1
fix msbuild XP configration mistake for language project
2015-10-21 21:09:39 +01:00
IntelOrca
00ff795d04
hide multiplayer button if network is disabled
2015-10-21 21:06:15 +01:00
IntelOrca
717d18c9e9
add XP msbuild configuration
2015-10-21 21:02:15 +01:00
Ted John
3585a1f99a
Merge pull request #2090 from janisozaur/types
...
Minor fixes
2015-10-21 12:55:13 +01:00
Ted John
776015d9d5
Merge pull request #2097 from Dandandan/optimizereadentirefile
...
Optimize readentirefile
2015-10-21 12:52:27 +01:00
Daniël Heres
17b906b3a0
Use SDL_RWsize to get size info
2015-10-21 10:15:02 +02:00
Daniël Heres
2a99ba95e1
Merge remote-tracking branch 'refs/remotes/OpenRCT2/develop' into develop
2015-10-21 09:09:02 +02:00
Michał Janiszewski
8e45cccb7a
Minor fixes
...
Includes (mostly) type fixes, dead code removal, signed vs unsigned
comparison fixes, memory leaks removal.
2015-10-21 08:47:09 +02:00
IntelOrca
be7d3d5b54
do not do any sound / music operations when in headless mode
2015-10-20 22:15:48 +01:00
IntelOrca
c097ce5b13
fix #2064
2015-10-20 21:36:09 +01:00
Ted John
a292a21e32
Merge pull request #2094 from janisozaur/whitespace
...
Strip all whitespace
2015-10-20 21:29:44 +01:00
duncanspumpkin
610a7d6954
Fix #2095 . Bitscanforward needs to return -1 if nothing found.
2015-10-20 20:40:17 +01:00
Michał Janiszewski
7d0ce00bab
Strip all whitespace
2015-10-20 20:48:51 +02:00
Ted John
6fb6bb2556
Merge pull request #2093 from Dandandan/optimizebitscan
...
Optimize bitscanforward using intrinsic function
2015-10-20 17:32:39 +01:00
Ted John
4f7476f8c2
Merge pull request #2092 from Dandandan/optimize
...
Optimize peep functions
2015-10-20 17:24:00 +01:00
Daniël Heres
d531243c98
Optimize bitscanforward using intrinsic function
2015-10-20 18:10:05 +02:00
Daniël Heres
6cf6c4be25
Optimize bitscanforward using intrinsic function
2015-10-20 18:06:03 +02:00
Daniël Heres
5c611dc600
Optimize peep functions
2015-10-20 17:35:31 +02:00
Ted John
ad7d2b3c00
Merge Localisation/master into OpenRCT2/develop.
2015-10-20 04:00:17 +01:00
Ted John
acca9c869b
Merge pull request #2089 from Dandandan/optimize
...
Cache expression in gfx_rle_sprite_to_buffer
2015-10-19 22:10:14 +01:00
Daniël Heres
4f4f434c5a
Bit shifting
2015-10-19 22:55:16 +02:00
Ted John
485b8d1508
Merge pull request #2088 from janisozaur/types
...
Fix types
2015-10-19 20:27:48 +01:00
Daniël Heres
328c42d5d5
Use same naming convention
2015-10-19 20:50:52 +02:00
Daniël Heres
7730665023
Cache expression in gfx_rle_sprite_to_buffer
2015-10-19 20:45:04 +02:00
Michał Janiszewski
d570163958
Fix types
...
Bunch of type fixes
2015-10-19 20:30:46 +02:00
Ted John
3f99209219
Refactor calculate_park_rating logic
...
...to avoid changing a local variable's meaning.
2015-10-19 12:20:21 +01:00
Duncan
671f45e45c
Merge pull request #2087 from clamburger/identify_peep_var_c6
...
Identify peep->var_C6
2015-10-19 12:05:24 +01:00
Sam Horn
7250adaf71
Identify peep->var_C6
2015-10-19 18:36:45 +10:00
IntelOrca
8c276acde7
fix #2085
2015-10-18 21:16:00 +01:00