mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity
6,087 Commits 8 Branches 58 Tags
b7820c09cd5bf39f0861f5f44dbdbec05b5fac9c
Commit Graph

6087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hielke Morsink
4e5b8295c8 fix #2750 invalidate top toolbar when toggling the use of money. 2016-01-17 14:53:59 +01:00
IntelOrca
0584de1501 fix part of #2747: mistake in map coordinate clamping for set ownership 2016-01-17 12:44:16 +00:00
IntelOrca
7c8245a63f fix #2749: inverse logic for removing colour tab on rides 2016-01-17 12:27:43 +00:00
Ted John
805b0dbb05 Merge Localisation/master into OpenRCT2/develop. 2016-01-17 04:00:18 +00:00
IntelOrca
88ae952db2 implement peep_easter_egg_peep_interactions 2016-01-17 00:57:37 +00:00
IntelOrca
f6841bd3dc implement peep_update_name_sort 2016-01-16 22:38:59 +00:00
IntelOrca
e57ac72e5a remove redundant peep_update_ride_sub_state callproc 2016-01-16 21:34:23 +00:00
Ted John
d0d883904f Merge pull request #2744 from janisozaur/broken-language 
Fall-back to default language in case none is set
 2016-01-16 17:56:02 +00:00
Michał Janiszewski
6d8e048d96 Fall-back to default language in case none is set 
From thread https://openrct2.org/forums/topic/720-openrct2-doesnt-work/,
the object http://www.nedesigns.com/rct2-object/5130/scgletrs/ does not
set `pString` properly, so use a default fallback in such case.
 2016-01-16 18:39:57 +01:00
Michał Janiszewski
f35fac6030 Update assert condition 2016-01-16 18:10:44 +01:00
Ted John
e75270515c Merge pull request #2743 from Broxzier/disable_debugging_online 
Disabling Debug Button When Playing Over A Network
 2016-01-16 16:48:04 +00:00
Hielke Morsink
711afebf50 Hiding debug button while playing over a network. 2016-01-16 17:24:44 +01:00
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