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
IntelOrca
a941e67df6
fix vehicle-update after merge with sub_6DAB4C
2015-12-14 23:31:00 +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
duncanspumpkin
c00669c942
Merge sub_6DAB4C into vehicle-update
2015-12-14 21:56:00 +00:00
Michał Janiszewski
a5b465fad1
Fix some compiler warnings
2015-12-14 22:52:27 +01:00
duncanspumpkin
3fccb00040
Fix spelling mistake. Finished gForce calculations.
...
There are bugs in any loops due to unsigned/signed behaviour
2015-12-14 21:42:06 +00: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
IntelOrca
19679de125
implement sub_6D661F
2015-12-14 20:08:15 +00:00
IntelOrca
e0af62ee8a
implement vehicle_update_scenery_door
2015-12-14 15:28:46 +00:00
IntelOrca
490bdc85a6
implement sub_6DEDE8
2015-12-14 15:18:40 +00:00
IntelOrca
656bc61a6a
implement more sub_6DAB4C
2015-12-14 15:18:39 +00:00
IntelOrca
89bcf50c76
implement more sub_6DAB4C
2015-12-14 15:18:39 +00:00
IntelOrca
83b15044c4
implement more sub_6DAB4C
2015-12-14 15:18:38 +00:00
IntelOrca
66a8a3f0cb
implement more sub_6DAB4C
2015-12-14 15:18:37 +00:00
IntelOrca
e3c1872d67
implement more sub_6DAB4C
2015-12-14 15:18:37 +00:00
IntelOrca
255e756e28
implement more sub_6DAB4C
2015-12-14 15:18:36 +00:00
IntelOrca
1e4f7c8875
implement more sub_6DAB4C
2015-12-14 15:18:35 +00:00
IntelOrca
8408351e07
implement more sub_6DAB4C
2015-12-14 15:18:34 +00:00
IntelOrca
2aeeb08af3
implement more sub_6DAB4C
2015-12-14 15:18:34 +00:00
IntelOrca
6a629adc24
implement more sub_6DAB4C
2015-12-14 15:18:33 +00:00
IntelOrca
adcbfec413
name return flags for sub_6DAB4C
2015-12-14 15:18:32 +00:00
IntelOrca
4eee290947
use original hook code which works better for this branch
2015-12-14 15:18:32 +00:00
IntelOrca
22857ae370
implement more sub_6DAB4C
2015-12-14 15:18:31 +00:00
