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

5110 Commits

Author SHA1 Message Date
Ted John f3bca21061 Merge pull request #2374 from JarnoVgr/develop 
Updated readme.md links
 2015-11-24 17:39:36 +00:00
JarnoVgr 2354957995 Re-added rct subreddit 2015-11-24 18:34:04 +01:00
JarnoVgr 271c7be3b5 Updated readme.md links 
Added forums link, removed voat link (no one used it), removed link to
'rct' subreddit (there's a 'openrct' subreddit link)
 2015-11-24 16:16:31 +01:00
Ted John c89561a81a Merge pull request #2372 from zsilencer/bugfixes 
Fix #2352
 2015-11-23 21:24:46 +00:00
zsilencer 0c3c9d5400 Fix #2352. Do not open disconnected status window when password input canceled. 2015-11-23 13:07:18 -07:00
Ted John 84e831b256 Merge pull request #2370 from daihakken/revert-2336-patch-1 
Revert "Update language.cpp (CHT font)"
 2015-11-23 08:40:18 +00:00
Harry Lam e528e32ec0 Revert "Update language.cpp (CHT font)" 2015-11-23 16:26:18 +08:00
Ted John e7655b059a Merge Localisation/master into OpenRCT2/develop. 2015-11-22 04:00:18 +00:00
Ted John 9a71321714 Merge pull request #2362 from e-foley/downward_launch_ratings 
fix #2361
 2015-11-22 02:26:35 +00:00
e-foley 523ee27355 add e-foley to contributors 2015-11-21 18:17:27 -08:00
e-foley b147fd3a90 make speed affect upward launch ratings only 2015-11-21 18:17:26 -08:00
IntelOrca c6308dcb41 stop ride window from opening when there is a vehicle crash on the title screen 2015-11-21 13:40:00 +00:00
Ted John 7474515e5c Merge Localisation/master into OpenRCT2/develop. 2015-11-21 04:00:17 +00:00
Ted John c4791ede7f Merge pull request #2353 from IntelOrca/track-paint-shop 
Implement paint function for food, drink, souvenir and ATMs
 2015-11-20 23:59:47 +00:00
IntelOrca 1ff2d68061 implement track paint shop 
implement track paint shop, part 2

implement track paint shop, part 3

implement track paint shop, part 4
 2015-11-20 22:53:53 +00:00
Ted John 562c9cb68e Merge Localisation/master into OpenRCT2/develop. 2015-11-20 04:00:18 +00:00
Ted John e9deafa5df Merge Localisation/master into OpenRCT2/develop. 2015-11-19 04:00:17 +00:00
Ted John 5609636db2 Merge pull request #2340 from janisozaur/optimize-fixes 
Fixes for building optimized binary on Linux
 2015-11-18 21:05:46 +00:00
janisozaur d037b937d8 Fix VS project file 2015-11-18 21:57:01 +01:00
Michał Janiszewski c4ad2346e3 Fixes for building optimized binary on Linux 
Use `-DCMAKE_BUILD_TYPE=X`, where X:
- `RELEASE`
- `RELWITHDEBINFO`
- `MINSIZEREL`

Only works for GCC, clang binaries crash for now.
 2015-11-18 21:29:08 +01:00
Duncan e36ed5e732 Merge pull request #2325 from BodrickLight/refactor 
Refactor audio.c and audio.h
 2015-11-18 17:33:21 +00:00
Dom Light 55fb03fa75 Replace a call to audio_play_sound_panned 2015-11-18 14:01:29 +00:00
Ted John b1a6836a2f Merge pull request #2336 from daihakken/patch-1 
Update language.cpp (CHT font)
 2015-11-18 08:29:24 +00:00
Harry Lam 0081fb8435 Update language.cpp (CHT font) 
Microsoft removed "MingLiu.ttc" in Windows 10 1511 for no reason. The alternative, "MingLiub.ttc" (which support more characters and existed since Vista (https://www.microsoft.com/typography/fonts/font.aspx?FMID=1772)) is kept instead.
 2015-11-18 13:54:22 +08:00
Ted John 64159d83d0 Merge Localisation/master into OpenRCT2/develop. 2015-11-18 04:00:17 +00:00
Dom Light 92a30e0a32 Add missing return documentation 
[skip ci]
 2015-11-18 00:20:22 +00:00
Dom Light a07333aeaf Move memory address documentation to header file 2015-11-18 00:11:31 +00:00
Dom Light bb62b7561a Replace some uses of play_sound_panned with play_sound_at_location 2015-11-18 00:03:15 +00:00
Dom Light e9b7e41635 Refactor audio_sound_play_planned 2015-11-17 23:05:24 +00:00
duncanspumpkin f1ffba8f21 Merge branch 'pre-release-0.0.3' into develop 2015-11-17 22:39:31 +00:00
Dom Light bbc58830f3 Allow lines to be 128 characters 2015-11-17 20:07:39 +00:00
Ted John aade14ba03 Merge pull request #2322 from Broxzier/search_types 
Searching through rides now also checks their type.
 2015-11-17 20:01:38 +00:00
Dom Light 72b6a1e74b Add parens and use coordinate_3d_to_2d in audio.c 2015-11-17 20:01:30 +00:00
Duncan cdb9ccc558 Merge pull request #2323 from Smeat/file_pattern 
Use fnmatch to match file patterns.
 2015-11-17 19:07:36 +00:00
duncanspumpkin 6d3eaafe2f Fix #2327. Fix no entry signs. 
Issue was caused by mistakenly not stopping searching for tiles after finding the correct one. Mistake made during refactoring
 2015-11-17 19:04:43 +00:00
Hielke Morsink 68b0068a22 Resolved warnings 2015-11-17 19:40:48 +01:00
Hielke Morsink 504f551eec Avoiding the use of strlen 2015-11-17 19:40:47 +01:00
Hielke Morsink 063a568a72 Searching through rides now also checks their type. 2015-11-17 19:40:44 +01:00
Ted John 50edff6158 Merge pull request #2314 from Gymnasiast/obsolete-tooltip 
Remote obsolete date tooltip
 2015-11-17 18:21:29 +00:00
Kevin c1fe547901 Add FNM_PATHNAME flag for fnmatch 2015-11-17 12:25:45 +01:00
Ted John 9300c7d372 Merge Localisation/master into OpenRCT2/develop. 2015-11-17 04:00:18 +00:00
Dom Light b9d48d2f9b Document audio.h 2015-11-17 01:05:22 +00:00
Dom Light b736de003e Sanitize audio.c 2015-11-17 01:05:21 +00:00
Dom Light 3a8b25a0ee Sanitize audio.h 2015-11-17 01:05:14 +00:00
Kevin 5cd0ab7fad Use fnmatch to match file patterns. 
strstr doesn't support wildcards, so patterns like '*.TD?' will fail.
This adds the possibility for more complex patterns.
 2015-11-17 00:27:29 +01:00
Alexander Overvoorde 0f065cf4a9 Add string ids for scenario name window 2015-11-16 20:30:38 +00:00
Alexander Overvoorde b83e570230 Fix length of max scenario name in scenario editor 2015-11-16 20:30:26 +00:00
duncanspumpkin c1ed727067 Fix #2305. Fences now build correctly with shift. 
Issue was caused by failing to reinitialise a variable and reusing a variable name for two different purposes. It has been fixed by nameing the variable and also initialising it.
 2015-11-16 20:19:58 +00:00
Duncan 62863db42a Merge pull request #2318 from Overv/fix_2316 
Fix length of max scenario name in scenario editor (fixes #2316)
 2015-11-16 19:07:23 +00:00
Duncan ca874e102b Merge pull request #2312 from zsilencer/bugfixes 
Fix #2311
 2015-11-16 18:49:42 +00:00