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
Michał Janiszewski 54424ea275 Remove old Linux workarounds 
Verified working on my machine.
 2015-12-21 21:52:42 +01: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
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
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
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
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
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
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
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
Ted John 6de3876855 Merge pull request #2503 from janisozaur/linker 
Linker
 2015-12-16 18:38:58 +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