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

5399 Commits

Author SHA1 Message Date
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
U-ASUS-EEEPC\Cameron Hall da79f706f3 Hoist gCheatsDisableSupportLimits check outside of loop 2015-11-16 12:09:11 -06:00
zsilencer 292b67874f Fix #2311. Water no longer is able to be raised above existing map elements. 2015-11-16 10:38:20 -07:00
Alexander Overvoorde 994dd1f945 Add string ids for scenario name window 2015-11-16 17:56:51 +01:00
Alexander Overvoorde 3ba35745c8 Fix length of max scenario name in scenario editor 2015-11-16 17:50:52 +01:00
Ted John b31e2d02bc Merge pull request #2317 from telk5093/patch-3 
Korean font change
 2015-11-16 16:33:48 +00:00
TELK 5d1c1b4445 Update language.cpp 2015-11-17 01:21:41 +09:00
Duncan 637e454fef Merge pull request #2290 from janisozaur/network-clean-close 
Skip closing network if already closed
 2015-11-16 15:58:00 +00:00
TELK 3889f5daad Korean font change 
change korean font from malgun to gulim.
I tested it is displayed correctly in korean os. See http://file.telk.kr/rct/img/gulim.png
 2015-11-17 00:56:22 +09:00
janisozaur d3329b74a5 Comment expected cmdline_call_action results 2015-11-16 13:59:01 +01:00
Duncan aacde9ddc3 Merge pull request #2310 from osconnoisseur/fix_fcntl_h 
Include <fcntl.h> instead of the non-standard <sys/fcntl.h>
 2015-11-16 12:28:54 +00:00
Gymnasiast 2afed6a4de Remote obsolete date tooltip 2015-11-16 11:04:00 +01:00
Ted John 9cbc1afbe2 Merge Localisation/master into OpenRCT2/develop. 2015-11-16 04:00:17 +00:00
Cameron 9f255e5045 Use fcntl.h instead of sys/fcntl.h 2015-11-15 15:58:22 -06:00
Cameron 763a5f2938 Restore newline at end of file 2015-11-15 15:50:36 -06:00
Cameron 1fc7793c2a Clean up and match coding style 2015-11-15 15:48:27 -06:00
duncanspumpkin 54d7b54cb3 Merge branch 'pre-release-0.0.3' into develop 2015-11-15 21:23:01 +00:00
duncanspumpkin 82498c4a57 Fix #1922. Corrected invalid viewport code. 
ACTIVE_VIEWPORT_PTR_ARRAY should be iterated along checking for a NULL pointer. To indicate the list end. Removed NEW_VIEWPORT macro as its description was incorrect.
 2015-11-15 21:05:30 +00:00
U-HP-Pavilion-PC\Cameron e5ad14e3f5 Finished decompiling 2015-11-15 12:20:01 -06:00
duncanspumpkin eaa2d10ec4 Fix #2070. Incorrect highest drop penalty height caused incorrect calculations 2015-11-15 18:11:49 +00:00
Duncan 2a54a98937 Merge pull request #2304 from janisozaur/iconv 
Make OpenRCT2 use iconv on Linux
 2015-11-15 17:18:36 +00:00
U-HP-Pavilion-PC\Cameron cfdc0cf057 More refactoring 2015-11-15 11:01:34 -06:00
Michał Janiszewski 7ba9ea2574 Make OpenRCT2 use iconv on Linux 
This makes possible to run the game with non-english locales on Linux

Fixes #2300, fixes #2268, fixes #2267
 2015-11-15 17:12:32 +01:00