IntelOrca
589dcb12b1
update VS filters
2015-12-19 12:15:32 +00:00
Ted John
f93bc91510
Merge pull request #2462 from duncanspumpkin/fix_trackSave
...
Fix Track Saving
2015-12-19 12:13:03 +00:00
Ted John
3570319cce
Merge pull request #2509 from janisozaur/openrct-data-path
...
Let user specify the data dir as cmdline option.
2015-12-19 00:06:45 +00:00
IntelOrca
3019b55415
implement facility_paint_setup
2015-12-19 00:06:31 +00:00
LRFLEW
d91a82f6ea
Added searching for OpenRCT2 data in OS X app bundle resources folder
2015-12-19 00:07:01 +01:00
Michał Janiszewski
ea6fa2c82a
Let user specify the data dir as cmdline option.
...
This adds --openrct-data-dir=<str> option to command line letting user
select where he wants OpenRCT2-specific data to be. By default the
search locations are:
* <exePath>/data (on all platforms)
* /var/lib/openrct2 (on Linux)
* /usr/share/openrct2 (on Linux)
2015-12-19 00:06:41 +01:00
IntelOrca
22b4df1a99
implement SI units for distance / speed measurement, closes #2496
2015-12-18 21:12:30 +00:00
Ted John
859c35574a
Merge pull request #2510 from LinusU/trap-mouse
...
Trap mouse
2015-12-18 21:06:57 +00:00
duncanspumpkin
306855fd3e
Fix doors corrupting elements
2015-12-18 21:05:49 +00:00
Ted John
fb9a2e4117
Merge pull request #2473 from kkirby/feature/dialogs
...
Add message dialog and directory open dialog on OS X
2015-12-18 20:37:57 +00:00
duncanspumpkin
0f3fe73e63
Fix more vehicle bugs. Changed sub_6DD078 to change the collide vehicle
2015-12-18 20:33:45 +00:00
Linus Unnebäck
e1938bb17a
trap-mouse: cleanup
2015-12-18 09:13:26 +01:00
Rune Laenen
1a4ebcc0f7
Add option to trap mouse cursor
2015-12-18 09:13:26 +01:00
Kyle Kirby
ddd724a4b3
Merge pull request #1 from LRFLEW/dialogs
...
Some Objective-C Code Cleanup
2015-12-17 22:19:11 -06:00
LRFLEW
8b63080aeb
Some Objective-C Code Cleanup
2015-12-17 22:06:07 -06:00
Ted John
ed8e6afb6f
Merge Localisation/master into OpenRCT2/develop.
2015-12-18 04:00:17 +00:00
duncanspumpkin
0364d0deb7
Fix vertical launch
2015-12-17 23:45:58 +00:00
duncanspumpkin
7f0f983f25
Fix block breaks
2015-12-17 23:12:08 +00:00
Ted John
ef7837b3ca
Merge pull request #2507 from OpenRCT2/Gymnasiast-patch-1
...
UK: Change 'peep' to 'guest' for consistency
2015-12-17 19:40:04 +00:00
Michael Steenbeek
7701dd600c
UK: Change 'peep' to 'guest' for consistency
2015-12-17 19:38:42 +01:00
duncanspumpkin
2007c6c4dc
Fix backwards bugs. Fix lift hill bug
2015-12-16 23:39:38 +00:00
duncanspumpkin
3c3dd963fa
Rearrange of code to match cable lift layout
2015-12-16 23:01:22 +00:00
duncanspumpkin
46dbc17d72
Move remaining cable lift functions out of vehicle.c
2015-12-16 21:37:58 +00:00
Ted John
1a206380f8
Merge pull request #2506 from LRFLEW/fixes
...
Fixed extern and enum name usage
2015-12-16 20:53:15 +00:00
LRFLEW
d769a13206
Fixed extern and enum name usage
2015-12-16 14:48:27 -06:00
Ted John
7ddcb765c0
Merge pull request #2505 from Gymnasiast/linker-fix
...
Fix building in paths with spaces not working properly on Linux
2015-12-16 19:45:14 +00:00
Gymnasiast
3db574b8bb
Fix building in paths with spaces not working properly on Linux
2015-12-16 20:31:33 +01:00
IntelOrca
12fdf1f5e7
name vehicle entry flags
2015-12-16 19:12:58 +00:00
Ted John
6de3876855
Merge pull request #2503 from janisozaur/linker
...
Linker
2015-12-16 18:38:58 +00:00
IntelOrca
462d13fed2
move cable lift code into separate source file
2015-12-16 18:37:45 +00:00
Michał Janiszewski
7d132d8fe1
Extract and embed sections into binary itself
...
Fixed some CMakeLists.txt problems, made another target for converting
section images into something palatable by ld, modified the linker
script to place these ssection at predefined VMAs and updated openrct2.c
with new checks.
2015-12-16 19:16:27 +01:00
Michał Janiszewski
072db27968
add vanilla script
2015-12-16 18:54:34 +01:00
duncanspumpkin
53a1d93ec3
Fix infinite loop. Backwards still not working
2015-12-15 22:59:15 +00:00
duncanspumpkin
606014dfe6
Fix small bug introduced
2015-12-15 22:36:07 +00:00
duncanspumpkin
94f94d038c
Refactoring of forward loop and fixing of small bugs
2015-12-15 22:32:11 +00:00
duncanspumpkin
37efbfd0a5
Refactor chunk_1 label functions
2015-12-15 18:56:19 +00:00
duncanspumpkin
a406a4b344
Fix merge related bugs
2015-12-15 18:26:44 +00:00
duncanspumpkin
75b5946299
Refactor get_g_force and fix known signed/unsigned issues
2015-12-15 17:47:30 +00:00
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
