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
duncanspumpkin
bed328503b
Add remaining track types to acceleration function
2015-12-13 15:33:01 +00: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
duncanspumpkin
be757f6379
Add missing track elem enum elements.
2015-12-12 21:07:46 +00:00
duncanspumpkin
1e72e9fb14
Started implementing get g forces
2015-12-12 20:25:20 +00: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
duncanspumpkin
846d69a772
Implement vehicle_update_bumper_car_collision
2015-12-12 17:59:03 +00:00
duncanspumpkin
5964b3768a
Implement bumper car motion update
2015-12-12 14:55:05 +00: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
duncanspumpkin
45d1375b83
Implement vehicle_update_collision setup. Removed ride crash hook.
2015-12-12 12:21:13 +00:00
duncanspumpkin
90d006232b
Change sign of var_24. Add missing cable lift data
2015-12-12 11:48:28 +00:00
Duncan
82683f41fe
Merge pull request #2470 from janisozaur/vehicle-update
...
vehicle-fixes
2015-12-12 11:28:40 +00:00
Michał Janiszewski
93e2fa14e8
vehicle-fixes
2015-12-12 12:27:58 +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
duncanspumpkin
4b326f4569
Implement vehicle_update_crash_setup
2015-12-11 20:55:34 +00:00
duncanspumpkin
c94d362077
Fix sound bugs
2015-12-11 20:26:26 +00:00
duncanspumpkin
a372637bd8
Implemented vehicle_update_unloading_passengers
2015-12-11 17:35:24 +00:00
duncanspumpkin
0a8ef64a83
Fix some small bugs. Actually use arrive code
2015-12-11 15:49:21 +00:00
duncanspumpkin
cd5a18b2c5
Implement vehicle_update_arriving
2015-12-11 15:28:07 +00:00
duncanspumpkin
cbf859bffb
Added vehicle_update_travelling_boat and vehicle_update_travelling_cable_lif
2015-12-11 13:07:22 +00:00
Kyle Kirby
8e5355640f
Convert spaces to tabs
2015-12-11 06:28:35 -06:00
duncanspumpkin
9f1b38f337
Track saving was broken due to using wrong coordinates
2015-12-11 09:57:08 +00:00
Duncan
3ba4677bd9
Merge pull request #2456 from LRFLEW/osx
...
Finished fixing support for OS X
2015-12-11 08:54:47 +00:00
Ted John
5cacb8d0ec
Merge Localisation/master into OpenRCT2/develop.
2015-12-11 04:00:17 +00:00
