Ted John
cf8733cd41
Merge pull request #2498 from Gymnasiast/track-design-with-hacked-ride-mode
...
Only check if ride mode exists when placing new track design, fixes #2445
2015-12-15 15:53:21 +00:00
Gymnasiast
e2ccfc1cb8
Only check if ride mode exists when placing new track design, fixes #2445
2015-12-15 15:09:39 +01:00
Duncan
0075410668
Merge pull request #2497 from OpenRCT2/Gymnasiast-changelog
...
Update changelog
2015-12-15 12:33:26 +00:00
Michael Steenbeek
0ce05129e0
Update changelog.txt
2015-12-15 13:29:16 +01:00
Ted John
d958c5ef87
Merge pull request #2495 from LinusU/update-math-to-std
...
use builtin min and max
2015-12-15 08:23:44 +00:00
Linus Unnebäck
4319e57024
use builtin min and max
2015-12-15 09:11:54 +01:00
Ted John
aed5117384
Merge pull request #2489 from LinusU/locale-clang-fix
...
osx: fix locale issues
2015-12-15 08:04:47 +00:00
Ted John
8e02cb5a07
Merge pull request #2494 from LinusU/osx-modifier-key
...
osx: correct modifier key
2015-12-15 08:03:16 +00:00
Linus Unnebäck
7ea7625db5
osx: correct modifier key
2015-12-15 08:34:33 +01:00
Linus Unnebäck
5d03fc3fb6
osx: fix locale issues
2015-12-15 08:22:08 +01:00
Ted John
59a1701ccc
Merge Localisation/master into OpenRCT2/develop.
2015-12-15 04:00:17 +00:00
Ted John
6466a33449
Merge pull request #2492 from janisozaur/countof
...
countof with type safety
2015-12-14 23:46:11 +00:00
Michał Janiszewski
98e204552a
countof with type safety
...
For reference see http://www.g-truc.net/post-0708.html and
http://lxr.free-electrons.com/source/include/linux/kernel.h#L54
This will provide a type-safe mechanism for counting elements of array.
If you try passing something which cannot be counted, compiler will
frown at you right away.
2015-12-15 00:28:58 +01:00
Ted John
e0195fcffd
Merge pull request #2491 from janisozaur/fixes
...
Fix some compiler warnings
2015-12-14 22:02:41 +00:00
Michał Janiszewski
a5b465fad1
Fix some compiler warnings
2015-12-14 22:52:27 +01:00
Ted John
1cb7d2177b
Merge pull request #2469 from LinusU/osx-install-script
...
osx: install.sh improvements
2015-12-14 21:21:35 +00:00
Ted John
bc104a82a9
Merge pull request #1931 from Gymnasiast/change-num-trains-without-retesting
...
Allow changing number of trains without retesting
2015-12-14 20:09:25 +00:00
Ted John
67f612c18c
Merge pull request #2460 from janisozaur/scale-limit
...
Raise the lower limit for scale to 0.5f
2015-12-14 14:49:38 +00:00
Ted John
df3bf363ca
Merge pull request #2338 from Smeat/linux_get_locale
...
[Linux] Implement platform_get_locale_language.
2015-12-14 14:48:21 +00:00
Ted John
4fb73e4acb
Merge pull request #2435 from samdroid-apps/ctrl-backspace-clear-inputs-try2
...
Implement CTRL-Backspace shortcut for clearing inputs, fixes #2355
2015-12-14 14:46:56 +00:00
IntelOrca
de48ad3af6
fix warnings in cmdline.c
2015-12-14 14:45:54 +00:00
Ted John
8bfde1f948
Merge pull request #2472 from kkirby/bugfix/osx1010
...
Fix a bug where argv will be replaced by the argparse library.
2015-12-14 14:36:51 +00:00
Kyle Kirbatski
c3185de49d
Fix a bug where argv will be replaced by the argparse library.
...
The argparse library takes the input, assigns it to `this->output`, and then writes a null pointer to it. This causes issues on OS X 10.10 because AppKit tries to read the arguments passed to the application, which the first argument is null.
2015-12-14 07:19:06 -06:00
Ted John
a423c6c458
Merge Localisation/master into OpenRCT2/develop.
2015-12-14 04:00:17 +00:00
Ted John
8e7b22ebfd
Merge pull request #2484 from janisozaur/linux-util
...
Include safe_strncpy declaration in linux.c
2015-12-13 22:54:17 +00:00
