Ted John
48320419ea
Merge pull request #2538 from janisozaur/vehicle-update-merge
...
vehicle-update merge
2015-12-22 16:24:38 +00:00
Duncan
fc301211c3
Merge pull request #2539 from janisozaur/vehicle-update-fixes
...
fixes for issues in vehcile-update
2015-12-22 16:16:50 +00:00
Michał Janiszewski
0903dda369
fixes for issues in vehcile-update
2015-12-22 17:00:21 +01:00
Michał Janiszewski
e666a24c82
Merge branch 'develop' into vehicle-update
...
Conflicts:
projects/openrct2.vcxproj.filters
src/audio/mixer.cpp
src/windows/ride.c
2015-12-22 14:57:40 +01:00
duncanspumpkin
7f68149516
Minor Refactor
2015-12-22 10:27:38 +00:00
duncanspumpkin
27d38c6f39
Fix incorrect comparison for backwards loop.
2015-12-21 22:18:56 +00:00
Ted John
13ce4b6a23
Merge pull request #2531 from LRFLEW/warning-cleanup
...
Fixed warnings in Xcode
2015-12-21 21:36:24 +00:00
Ted John
569fd7771c
Merge pull request #2532 from LRFLEW/newline
...
Added newlines at end of files
2015-12-21 21:36:05 +00:00
Ted John
39360e40a8
Merge pull request #2120 from janisozaur/linux
...
Remove old Linux workarounds
2015-12-21 21:35:52 +00:00
Ted John
bdbb25f340
Merge pull request #2534 from janisozaur/server-no-description
...
Safe handling of malformed server entries
2015-12-21 21:35:45 +00:00
IntelOrca
bc24393239
implement vehicle_update_motion_boat_hire
2015-12-21 21:33:17 +00:00
Michał Janiszewski
d610fb5970
Remove call to 0x0040701D
2015-12-21 22:17:13 +01:00
Michał Janiszewski
5d227d8fc8
Safe handling of malformed server entries
...
Refuse to add a nameless server or one without version specified, but
allow description missing.
2015-12-21 22:14:24 +01:00
Michał Janiszewski
54424ea275
Remove old Linux workarounds
...
Verified working on my machine.
2015-12-21 21:52:42 +01:00
IntelOrca
3b7839c026
implement try_add_synchronised_station
2015-12-21 18:26:41 +00:00
duncanspumpkin
9d937b3475
Refactor of backwards get next track
2015-12-21 09:19:35 +00:00
LRFLEW
85800997c2
Fixed warnings in Xcode
2015-12-21 03:11:38 -06:00
Ted John
dbb804018b
Merge pull request #2528 from LRFLEW/osx-touch-why
...
Fixed trackpad-as-touchscreen on OS X
2015-12-21 08:27:38 +00:00
LRFLEW
e6f771ec90
Added newlines at end of files
2015-12-20 22:03:37 -06:00
Ted John
b6b18c812f
Merge Localisation/master into OpenRCT2/develop.
2015-12-21 04:00:18 +00:00
LRFLEW
46e773736c
Fixed trackpad-as-touchscreen on OS X
2015-12-20 21:12:14 -06:00
IntelOrca
eab3e15182
improve touch positioning
2015-12-21 00:39:38 +00:00
IntelOrca
8bb8beee50
fix warnings in cmdline.c
2015-12-21 00:23:59 +00:00
Ted John
5d8cd60c8c
Merge pull request #2520 from samdroid-apps/touch-as-cursor-try-2
...
Handle touch events
2015-12-20 22:50:05 +00:00
Ted John
5a4d0ccfcd
Merge pull request #2527 from LRFLEW/xcode
...
Fixed curl error in OS X bundles
2015-12-20 22:27:29 +00:00
LRFLEW
ff62a28ccd
Fixed curl error in OS X bundles
2015-12-20 16:22:10 -06:00
Ted John
e0ac85891b
Merge pull request #2518 from LRFLEW/xcode
...
Added Xcode Project
2015-12-20 21:52:57 +00:00
duncanspumpkin
e14fa03be1
Labelled remaining_distance. Relabelled acceleration/powered acceleration
2015-12-20 21:36:11 +00:00
duncanspumpkin
c4d8b8c665
Fix sign issues with global constants. Fix fast backwards rides breaking speed calculations
2015-12-20 20:58:30 +00:00
LRFLEW
034bf5c6a5
Added Xcode Project
2015-12-20 14:53:40 -06:00
Ted John
44bb3acfaf
Merge pull request #2525 from Gymnasiast/extend-fast-lift-hill
...
Extend fast lift hill cheat and update description, fixes #2524
2015-12-20 20:33:11 +00:00
Gymnasiast
dd460300ca
Extend fast lift hill cheat and update description
2015-12-20 21:12:24 +01:00
IntelOrca
742fe96cda
implement vehicle_can_depart_synchronised
2015-12-20 18:33:43 +00:00
IntelOrca
6825c8645f
implement vehicle_update_swinging_car
2015-12-20 15:22:51 +00:00
IntelOrca
98178c2560
refactor callprocs in vehicle.c
2015-12-20 14:21:06 +00:00
IntelOrca
c2c41ec118
implement steam_particle_create
2015-12-20 12:50:33 +00:00
IntelOrca
09ac928fd6
implement sub_6D63D4
2015-12-20 12:30:10 +00:00
Ted John
783992a5d6
Merge pull request #2521 from HaasJona/decimalms
...
Add one decimal place to SI velocities
2015-12-20 11:31:39 +00:00
Jonathan Haas
7149e1a4f5
Fix utf8_is_format_code
2015-12-20 12:28:44 +01:00
Jonathan Haas
bf536ce7b7
Add one decimal place to SI velocities
2015-12-20 11:27:03 +01:00
Sam Parkinson
2852c02e0a
Handle touch events
...
Natively on Linux, using OpenRCT2 with touch is impossible because
touch events are not handled by the game. They just don't do anything.
This commit handles touch events. A single touch represents a
press of the left mouse button. If it followed by another touch
within 300ms, a right mouse button event is emitted. This timeout
is like that of mobile web browsers [1].
[1] https://developers.google.com/web/updates/2013/12/300ms-tap-delay-gone-away?hl=en
2015-12-20 19:33:12 +11:00
Ted John
229abec6bf
Merge Localisation/master into OpenRCT2/develop.
2015-12-20 04:00:17 +00:00
IntelOrca
785d54aa04
fix #2502 : Update current pressed footpath direction when camera rotates
2015-12-19 22:54:15 +00:00
IntelOrca
560ec3e647
Merge branch 'implement-support-drawing' into develop
2015-12-19 21:31:39 +00:00
IntelOrca
1ffc9a6355
fix problems with wooden_a_supports_paint_setup and refactor
2015-12-19 21:30:32 +00:00
IntelOrca
96b9a4ed18
implement wooden_a_supports_paint_setup
2015-12-19 20:11:04 +00:00
IntelOrca
0ec91d62b5
fix #2515
2015-12-19 20:09:37 +00:00
IntelOrca
57207bac34
refactor new track painter, reduce empty jump tables
2015-12-19 12:39:07 +00:00
IntelOrca
4f5f0820d5
fix track manage delete prompt window position
2015-12-19 12:17:42 +00:00
IntelOrca
589dcb12b1
update VS filters
2015-12-19 12:15:32 +00:00
