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

6025 Commits

Author SHA1 Message Date
Ted John 391bea67bb Merge pull request #2634 from oslerw/develop 
Add /usr/local/share to search path for data files
 2016-01-16 14:49:34 +00:00
duncanspumpkin 0f6c8b8760 Refactor get small scenery to prevent repeats of #2735. 2016-01-16 11:04:06 +00:00
duncanspumpkin 3865bf9381 Fix #2735. 1/4 tile scenery can now correctly be recoloured. 
Issue was caused by an assumption made during writing this function.
 2016-01-16 10:55:36 +00:00
duncanspumpkin 06fd1436ca Fix #2741. 2 functions were missed during object_load refactor. 2016-01-16 10:21:15 +00:00
duncanspumpkin 599d806113 Fix #2740. Swinging animations should now work correctly 2016-01-16 10:11:56 +00:00
duncanspumpkin 3b760ba39c Fix windows build. Now uses the correct ISO C strdup function. 2016-01-16 09:49:39 +00:00
Duncan 30594f28e9 Merge pull request #2714 from LRFLEW/sub_69A997 
Decompiled sub_69A997
 2016-01-16 09:43:31 +00:00
William Osler 60920a2d10 Add /usr/local/share to search path for data files 
`/usr/local` should be examined before `/var/lib,` since it allows for
overriding data files that might come from the package manager.
 2016-01-15 22:47:12 -05:00
Michał Janiszewski 2b29f252e5 Assert for evergreen gardens 2016-01-16 00:19:08 +01:00
Ted John e69e384d43 Merge pull request #2692 from marijnvdwerf/use-named-addresses 
Replace known addresses with constants, globals and wrapper functions
 2016-01-15 22:59:13 +00:00
Ted John 538bf7e141 Merge pull request #2738 from janisozaur/map-limit 
Limit arguments to map functions
 2016-01-15 22:48:15 +00:00
Michał Janiszewski 17fb150ec0 Limit arguments to map functions 
While there is nothing wrong with the code as it is now, some
unexpected arguments can cause entering a loop which will flood the
log and possibly stall the game.
 2016-01-15 23:29:51 +01:00
LRFLEW 758c2d3d3e Decompiled sub_69A997 2016-01-15 14:43:10 -07:00
IntelOrca 2681cc792b Merge branch 'develop' of https://github.com/OpenRCT2/OpenRCT2 into develop 2016-01-15 20:21:15 +00:00
IntelOrca 666bb03cc3 fix #2734: forgot to correct signature arguments for clip_drawpixelinfo 2016-01-15 20:20:29 +00:00
Ted John b4125e87cb Merge pull request #2731 from janisozaur/ride-type 
Validate ride type to create
 2016-01-15 20:17:57 +00:00
Ted John 36513c9431 Merge pull request #2730 from janisozaur/config 
Release config on closing to limit leaked memory
 2016-01-15 20:12:29 +00:00
Ted John 2082023db7 Merge pull request #2736 from janisozaur/set-staff-patrol 
Check input arguments for set staff patrol command
 2016-01-15 20:10:53 +00:00
Marijn van der Werf 2e72d3c447 Bugfix: get `rideIndex` from current map element 2016-01-15 21:03:38 +01:00
Marijn van der Werf db34cf1515 Rename struct members to match identified address names 2016-01-15 21:03:17 +01:00
Marijn van der Werf 94e47be3e3 Use `ride_type_has_flag` for checking ride type flags 2016-01-15 21:02:39 +01:00
Marijn van der Werf 6568798af7 Use globals instead of addresses where applicable 2016-01-15 21:01:49 +01:00
Marijn van der Werf 98b5ad1bf4 Replace known addresses with constants 2016-01-15 21:01:34 +01:00
duncanspumpkin 10f85322ae Fix incorrect rct2 address comments 2016-01-15 19:17:00 +00:00
Michał Janiszewski 35147bd973 Check input arguments for set staff patrol command 2016-01-15 19:57:57 +01:00
Michał Janiszewski 836343b194 Unload graphics when done 2016-01-15 19:19:10 +01:00
Michał Janiszewski 7dae861dab Unload all objects on dispose to stop memory leaks 2016-01-15 16:37:27 +01:00
Michał Janiszewski 260fa88bae Validate ride type to create 2016-01-15 15:25:04 +01:00
Michał Janiszewski ab3d2a1ad9 Release config on closing to limit leaked memory 2016-01-15 14:55:36 +01:00
Ted John 57420cbc66 Merge Localisation/master into OpenRCT2/develop. 2016-01-15 04:00:19 +00:00
Ted John 45225cfa06 Merge pull request #2718 from OpenRCT2/normalise-platform-guards 
Normalise platform guards with SDL2
 2016-01-14 21:53:27 +00:00
IntelOrca f1f0b76a2b remove cdecl original call macros 2016-01-14 20:21:10 +00:00
IntelOrca 730463dbbb remove rct2_malloc, rct2_realloc and rct2_free 2016-01-14 20:18:55 +00:00
IntelOrca b7484db239 refactor clip_drawpixelinfo to not allocate memory 2016-01-14 20:12:44 +00:00
IntelOrca cdee534eb1 use SDL2's platform defines to normalise platform guards 2016-01-14 20:12:43 +00:00
duncanspumpkin e68ae821db Fix #2717. Total air time now reset before testing. 
This would cause total air time to become a very large number if you made changes to a ride and retested it
 2016-01-14 18:56:29 +00:00
duncanspumpkin 937de36e49 Fix #2719. Vehicles getting stuck in unloading passengers mode 2016-01-14 18:41:15 +00:00
duncanspumpkin 23dbde38e2 Refactor. Split golf vehicle update code into seperate function 2016-01-14 18:25:41 +00:00
duncanspumpkin d3cb8c4ef6 Fix #2720. Golf peeps no longer walk incorrectly to the hole. 2016-01-14 18:04:07 +00:00
duncanspumpkin f2b70b74aa Fix incorrect common format offset causing issues when changing colour scheme 2016-01-14 17:47:06 +00:00
Ted John 0450aa0057 Merge Localisation/master into OpenRCT2/develop. 2016-01-14 04:00:19 +00:00
Ted John 608c90db12 Merge pull request #2707 from marijnvdwerf/share-currency-detection 
Merge currency detection and add missing currencies
 2016-01-13 20:47:23 +00:00
Marijn van der Werf 0825b9bf62 Share currency detection across platforms 2016-01-13 21:38:10 +01:00
Ted John 370a06f74a Merge pull request #2716 from marijnvdwerf/min-window-size 
Set minimal window size to 720×480
 2016-01-13 18:56:33 +00:00
Marijn van der Werf 452acd7627 Set minimal window size 2016-01-13 19:55:35 +01:00
Ted John 69bc5e1c94 Merge pull request #2715 from janisozaur/build-id 
Drop number from build ID.
 2016-01-13 18:07:21 +00:00
Michał Janiszewski 1e5f59df29 Drop number from build ID. 2016-01-13 14:33:19 +01:00
Ted John 38c52e28dc Merge pull request #2711 from marijnvdwerf/add-cmd-modifier 
Allow using CMD as shortcut modifier
 2016-01-13 12:45:21 +00:00
Ted John 56b5bd1ace Merge pull request #2713 from janisozaur/ride-validity 
Check for ride validity in game commands
 2016-01-13 12:45:07 +00:00
Marijn van der Werf 138f0139c8 Add `PLATFORM_MODIFIER` as alias for CMD/CTRL 2016-01-13 11:06:25 +01:00