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

4998 Commits

Author SHA1 Message Date
Ted John 14ec8a7fc5 Merge pull request #2132 from Gymnasiast/obsolete-sound-and-config 
Remove obsolete sound and config code
 2015-10-25 21:16:45 +00:00
Gymnasiast 98fd1bf95d Reinstate RCT2_ADDRESS_VEHICLE_SOUND_LIST 2015-10-25 21:42:09 +01:00
Gymnasiast 2b0d5b2470 Remove obsolete sound and config code 2015-10-25 20:54:19 +01:00
Ted John 865c1a68a7 Merge pull request #2130 from Dandandan/readability 
Replace constants in world/sprite.c
 2015-10-25 16:43:59 +00:00
IntelOrca 4ac42ff1b2 add vehicle struct, enum labels and helper functions from implement-ride-create-vehicles branch. 2015-10-25 16:00:21 +00:00
Daniël Heres 358647d07c Replace constants in world/sprite.c 2015-10-25 16:34:01 +01:00
Ted John 79a6e1adee Merge pull request #2118 from janisozaur/memory 
Memory handling fixes
 2015-10-25 13:10:48 +00:00
Michał Janiszewski fcd22dd8ca Memory handling fixes 2015-10-25 01:15:52 +02:00
e-foley 73eed6830a remove unnecessary rating conditioning 
Remove old workaround to issue #2064
 2015-10-24 14:59:55 -07:00
e-foley 663e430300 cap airtime bonus 
Caps airtime addition to excitement rating rather than allowing infinite
subtraction
 2015-10-24 14:54:15 -07:00
Ted John 3be4dc748a Merge pull request #2115 from Dandandan/optimize 
Fix assignment
 2015-10-24 20:16:34 +01:00
Daniël Heres 9752d197e6 Fix assignment 2015-10-24 21:02:08 +02:00
Ted John cfa847ee71 Merge pull request #2113 from Broxzier/develop 
Added 10-minute inspections cheat.
 2015-10-24 19:13:30 +01:00
Duncan d7a1747407 Merge pull request #2114 from Dandandan/optimize 
Cache width of line in gfx_bmp_sprite_to_buffer
 2015-10-24 18:16:28 +01:00
Daniël Heres 3ebd576d78 Cache width of line 2015-10-24 18:25:11 +02:00
Hielke Morsink e5ce186534 Wrapped new widget with () 2015-10-24 17:23:34 +02:00
Hielke Morsink dc8e197799 Added 10-minute inspections cheat. 2015-10-24 17:10:33 +02:00
Ted John 5e9912e880 Merge pull request #2038 from HaasJona/restart_required 
Require a restart after changing hardware rendering
 2015-10-24 14:44:01 +01:00
Jonathan Haas 475466dcd9 Require a restart after changing hardware rendering setting, decouple setting from active status 2015-10-24 12:50:28 +02:00
Ted John abdcd50c8e Merge pull request #2112 from Dandandan/optimize 
Low level optimizations
 2015-10-24 11:49:32 +01:00
Daniël Heres 29976790cb Low level optimizations 
* Just memcpy if we don't have to use a pallete and zoom_amount == 1
* Replace some divide operations by right-shifts
* Optimize / simplify sub_68B3FB
 2015-10-24 12:32:56 +02:00
Ted John 1cd1344711 Merge pull request #2109 from Overv/develop 
Disable drawing if the window is minimized or otherwise hidden
 2015-10-23 18:22:31 +01:00
Ted John 97f9e8127f Merge pull request #2108 from janisozaur/memory 
Only copy strings when they're different
 2015-10-23 18:21:46 +01:00
Alexander Overvoorde 8a23aa1bec Change openrct2_loop to not draw if window is minimized or otherwise hidden (fixes #2096) 2015-10-23 17:33:25 +02:00
Michał Janiszewski 79552feb54 Only copy strings when they're different 
When called from window_loadsave_scrollmousedown,
window_loadsave_populate_list will try to strncpy a string over itself.
This commit prevents that.
 2015-10-23 17:22:31 +02:00
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