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

5611 Commits

Author SHA1 Message Date
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
Michał Janiszewski 3bf659a9ea Include safe_strncpy declaration in linux.c 
Fixes at least one of #2483
 2015-12-13 23:09:59 +01:00
Duncan 0604068aac Merge pull request #2440 from LinusU/world-map-fixes 
small fixes to world/map.c
 2015-12-13 21:27:40 +00:00
Linus Unnebäck 017899c0d9 small fixes to world/map.c 2015-12-13 21:45:58 +01:00
Ted John 7007aef9cb Merge pull request #2480 from LinusU/proper-types 
use stdint types
 2015-12-13 18:24:12 +00:00
Linus Unnebäck a613de410a use stdint types 2015-12-13 19:01:54 +01:00
Gymnasiast 1873e387ca Log an error if an unknown vehicle edit command is sent 2015-12-13 15:49:23 +01:00
Gymnasiast e9840b7488 Allow changing number of trains without retesting 2015-12-13 15:49:23 +01:00
Ted John 32a794731c Merge Localisation/master into OpenRCT2/develop. 2015-12-13 04:00:17 +00:00
Ted John 3274826a45 Merge pull request #2474 from janisozaur/g2 
Add g2 target for easy generation
 2015-12-13 00:38:55 +00:00
IntelOrca 5c3bcda744 fix wrong output steam in cmdline_sprite 2015-12-13 00:28:25 +00:00
Kyle Kirbatski 88e67bbae0 Fix for Windows build 2015-12-12 18:15:38 -06:00
Kyle Kirbatski 2a8ed04eda Add platform dialog functions for OS X 2015-12-12 17:22:14 -06:00
Kyle Kirbatski 17766c4772 Rename osx.c to osx.m 2015-12-12 17:21:21 -06:00
Kyle Kirbatski 39ae4e2154 Extract dialog functions out of posix.c and into linux.c 2015-12-12 17:20:02 -06:00
Kyle Kirbatski 20df0a0be7 Add `.m` files 2015-12-17 11:52:57 -06:00
Michał Janiszewski 40059ced39 Add g2 target for easy generation 2015-12-12 23:28:56 +01:00
Duncan e953eed95b Merge pull request #2467 from kkirby/code-cleanup 
Code cleanup
 2015-12-12 20:13:29 +00:00
Kyle Kirbatski 4f03530e48 Clean up instances of 0x.. & 0x.. to 0x.., 0x.. 2015-12-12 14:08:09 -06:00
Linus Unnebäck 53aab62bd3 osx: readme 2015-12-12 13:57:38 +01:00
Linus Unnebäck 0a5925506e osx: install.sh improvements 2015-12-12 13:53:06 +01:00
Duncan 0a86b8c946 Merge pull request #2450 from janisozaur/mmap 
POSIX: MAP_ANONYMOUS should have fd = -1
 2015-12-12 08:23:50 +00:00
Duncan fee65959e2 Merge pull request #2465 from LRFLEW/osx-config-move 
Moved the configuration on OS X to ~/Library/Application Support/OpenRCT2
 2015-12-12 07:38:11 +00:00
Ted John 3ed756d98c Merge Localisation/master into OpenRCT2/develop. 2015-12-12 04:00:17 +00:00
LRFLEW c2202f6260 Moved the configuration on OS X to ~/Library/Application Support/OpenRCT2 2015-12-11 18:02:58 -06:00
Kyle Kirby caf07c2064 Clean up the comments a litte 
• Make comment heads be /**
• Make rct2 addresses be double spaced indented
• Make there be a space afte rct2: and the address
• Make single-line rct2 addresses be full block comments
• Move description of method to top of comment
 2015-12-11 16:19:46 -06:00