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

4876 Commits

Author SHA1 Message Date
Ted John b05b54c3fc Merge pull request #2148 from Overv/insert_enum_constants 
Replace RCT2_GLOBAL magic numbers with address identifiers and string ids
 2015-10-29 12:02:52 +00:00
Alexander Overvoorde 56645a6941 Revert address constant replacement in ride.h 2015-10-29 09:44:46 +01:00
Alexander Overvoorde 111ddeb445 Replace old RCT2_ADDRESS_RIDE_ENTRIES accesses by GET_RIDE_ENTRY() 2015-10-29 09:44:46 +01:00
Alexander Overvoorde 060d41f5a0 Replace raw addresses in RCT2_ADDRESS() with identifiers 2015-10-29 09:44:46 +01:00
Alexander Overvoorde 01793e11b7 Replace RCT2_GLOBAL magic numbers with address identifiers and string ids 2015-10-29 09:44:46 +01:00
kmdreko 115c099e2a Decompiled sub_6E7FF3 2015-10-28 23:26:33 -05:00
Ted John 0b66558852 Merge Localisation/master into OpenRCT2/develop. 2015-10-29 04:00:17 +00:00
Duncan 54dd6cac15 Merge pull request #2149 from duncanspumpkin/track_paint 
Top Spin Track paint
 2015-10-28 20:18:43 +00:00
duncanspumpkin 930bdc1669 Make suggested changes. Invis huts now correctly remove fence 2015-10-28 19:57:02 +00:00
duncanspumpkin d9b7c1fafd Implement remaining rotations 2015-10-28 19:02:32 +00:00
duncanspumpkin e7c653abf2 Refactor attached ps setup code 2015-10-28 18:44:44 +00:00
duncanspumpkin c62e61bd36 Started implementing rotation 0 2015-10-28 18:44:44 +00:00
duncanspumpkin 330b6b5524 Implemented tables for top spin paint setup 2015-10-28 18:44:43 +00:00
Ted John f233f5c498 Merge pull request #2146 from janisozaur/develop 
Cleanups
 2015-10-28 08:14:03 +00:00
Ted John 7ae3b887d3 Merge pull request #2144 from LinusU/draw-rect-include 
add limits.h include for CHAR_BIT
 2015-10-28 08:12:29 +00:00
Michał Janiszewski 2f457aeffc Cleanups 
* Remove unused function in config.c
* Check handle *before* it is used
* Provide explicit parentheses around unclear if statements
 2015-10-28 08:06:45 +01:00
Linus Unnebäck 29243780c8 add limits.h include for CHAR_BIT 2015-10-28 07:33:56 +01:00
Ted John 7ac22b3be5 Merge Localisation/master into OpenRCT2/develop. 2015-10-28 04:00:16 +00:00
Ted John df5538e930 Merge pull request #2143 from janisozaur/develop 
Guard against possible NULL dereference
 2015-10-27 17:45:16 +00:00
Michał Janiszewski 0cdaa0b57e Guard against possible NULL dereference 2015-10-27 18:32:39 +01:00
Ted John e7e25a8fb4 Merge pull request #2141 from zsilencer/network 
ipv6 support, non-blocking address resolve and connect
 2015-10-27 08:22:03 +00:00
zsilencer 00e2ca43a1 ipv6 support, non-blocking address resolve and connect 2015-10-26 22:35:34 -06:00
Ted John 4865cedc59 Merge Localisation/master into OpenRCT2/develop. 2015-10-27 04:00:18 +00:00
Ted John 680bb0c52b Merge pull request #2137 from Gymnasiast/practical-map-size 
Display the visible/practical map size instead of the technical size, fixes #2133
 2015-10-26 14:00:40 +00:00
Gymnasiast 9504f3f10d Replace missed occurrence of magic numbers with defines 2015-10-26 13:53:26 +01:00
Gymnasiast 61444c8518 Display the visible/practical map size instead of the technical size, fixes #2133 2015-10-26 10:21:04 +01:00
Ted John 04eacc8904 Merge Localisation/master into OpenRCT2/develop. 2015-10-26 04:00:17 +00:00
IntelOrca 8d84b540ad add vehicle struct and enum labels from vehicle-update branch. 2015-10-25 21:26:03 +00:00
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