1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-25 15:54:31 +01:00
Commit Graph

4632 Commits

Author SHA1 Message Date
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
LRFLEW
c9be2e1bc9 Resolved struct packing error and crash on OS X 2015-12-10 17:29:58 -06:00
Michał Janiszewski
d2117e966f Raise the lower limit for scale to 0.5f
Setting the scale to anything lower than 0.3f crashes the game on my
machine, although I don't know the exact reason of that.

The game at window_scale=0.1 is unusable anyway, as the interface is far
too small.
2015-12-11 00:15:17 +01:00
Kyle Kirbatski
af382b1884 Switched to -sectcreate instead of mmap on OS X 2015-12-10 16:32:46 -06:00
Duncan
1456049dfb Fixed alignment of hook 2015-12-10 16:32:45 -06:00
Michał Janiszewski
1bafbde113 Shift segments in Mach-O to outside of required AS
Mach-O defaults to having .text segment starting at 0x1000 RVA, which
clashes with the address space required for mmap to work properly.

This change tells linker to move the segment outside of required AS, and
then some, so that mmap can properly allocate required addresses without
evicting anything else.
2015-12-10 16:32:45 -06:00
duncanspumpkin
ce56b2c7f7 Aligned hook for better OS X support 2015-12-10 16:31:41 -06:00
Ted John
2ee71fc230 Merge pull request #2457 from LinusU/osx-small-fixes
OS X build fixes
2015-12-10 12:19:02 +00:00
Ted John
c9c390fe3f Merge pull request #2454 from Gymnasiast/scale-factor-console
Add console option to set window scale, fixes #2356
2015-12-10 12:17:46 +00:00
Linus Unnebäck
894d2cd130 osx: define MAP_ANONYMOUS 2015-12-10 09:35:31 +01:00
IntelOrca
ca01e55fa8 add show fps, #2223 2015-12-09 21:42:46 +00:00
Gymnasiast
e61919565a Round window scale to 3 decimal places 2015-12-09 22:15:15 +01:00
Gymnasiast
7bebbe52a5 Add console option to set window scale 2015-12-09 18:43:33 +01:00
Ted John
b234a69d3c Merge pull request #2452 from Gymnasiast/warning-to-verbose
Don't log warnings on finding files, only log to verbose instead
2015-12-09 15:32:12 +00:00
Gymnasiast
e9737ebb61 Don't log warnings on finding files, only log to verbose instead 2015-12-09 15:54:49 +01:00
Gymnasiast
cfe3d967f5 Use Arial for Polish, as the sprite font misses several Polish letters. 2015-12-09 15:50:15 +01:00
Michał Janiszewski
3d0fcc948d POSIX: use mincore to detect impending doom
Call to mmap (or next malloc) will likely fail if there are already
mapped pages within the region we want to map ourselves. Using mincore
we can detect if such pages exist and warn user about what's going to
happen.
2015-12-09 00:57:42 +01:00
duncanspumpkin
e09e00c931 Label track_progress offset. Name cable lift motion update 2015-12-08 23:19:40 +00:00
Michał Janiszewski
8f82e5013a POSIX: MAP_ANONYMOUS should have fd = -1 2015-12-08 23:30:55 +01:00
IntelOrca
08fc36ee49 fix #2449: Turning off Day/Night Circle while it is night doesn't reset back to day 2015-12-08 20:50:30 +00:00
Ted John
176381b642 Merge pull request #2444 from jackinloadup/farris-wheel-backward-rotation
fixes #2126 Ferris wheel backward rotation
2015-12-07 17:54:45 +00:00
Lucas Riutzel
489d047c66 fix farris wheel breaking when set in backwards rotation 2015-12-07 10:40:53 -06:00
Duncan
2e9945a748 Merge pull request #2442 from LinusU/platform-osx-fixes
small fixes for platform/osx.c
2015-12-07 12:49:23 +00:00
Ted John
47e8c54b89 Merge pull request #2443 from LinusU/ride-track-fixes
use larger integers in ride/track.c
2015-12-07 08:13:04 +00:00
Linus Unnebäck
4bfbe27116 use larger integers in ride/track.c 2015-12-06 18:56:09 +01:00
Linus Unnebäck
16e5ace672 use RCT2_ADDRESS_TRACK_LIST 2015-12-06 18:49:35 +01:00
Linus Unnebäck
fc849eb097 small fixes for platform/osx.c 2015-12-06 18:34:34 +01:00
Linus Unnebäck
bd82b7a297 use RCT2_ADDRESS in track_manage.c 2015-12-06 18:22:33 +01:00
duncanspumpkin
80f034251e Fix remaining bugs in cable lift and warnings 2015-12-06 17:14:46 +00:00
duncanspumpkin
2e40ad2a35 Link up cable lift update code. Fix some bugs 2015-12-06 17:04:57 +00:00
duncanspumpkin
33a1560419 Implement more of cable lift update. Still requires proper linking up 2015-12-06 10:45:32 +00:00
Ted John
1d3cefe73d Merge pull request #2427 from xperia64/develop
Add symbolic link support
2015-12-05 21:34:44 +00:00
Kevin
a18089145b [Linux] Check for null pointer in locale specific functions 2015-12-05 22:25:25 +01:00
Ted John
e77537b27f Merge pull request #2396 from janisozaur/osx-path
Set path properly for OS X
2015-12-05 14:21:41 +00:00
Ted John
ebcde1b231 Merge pull request #2418 from janisozaur/fixes
fix remaining suspicious left shifts
2015-12-05 14:20:29 +00:00
Ted John
4ed7a3496e Merge pull request #2347 from Gymnasiast/default-measurement-system
Change fallback measurement system to metric.
2015-12-05 13:32:07 +00:00
Ted John
8e3bfb7a58 Merge pull request #2409 from Gymnasiast/track-designs-manager-close
Add close button to track designs manager, closes #1807
2015-12-05 13:31:31 +00:00
duncanspumpkin
a059f87805 Implement more of cableLift update 2015-12-05 12:05:15 +00:00
duncanspumpkin
2cbbf52a1b Implemented start of cableLift update 2015-12-05 10:49:23 +00:00
duncanspumpkin
2d2c419d60 Implemented cable lift move to end of station 2015-12-05 10:49:22 +00:00
duncanspumpkin
9561f87903 Implement cable lift waiting to depart 2015-12-05 10:49:22 +00:00
duncanspumpkin
5a69dd50ef Implemented some of the cable lift code 2015-12-05 10:49:21 +00:00
duncanspumpkin
9e182df025 Labeled lost_time_out 2015-12-05 10:49:21 +00:00
duncanspumpkin
95ac8d67ee Implement vehicle missing. Fixed bugs with reverese incline 2015-12-05 10:49:20 +00:00
duncanspumpkin
6e675b08c3 Implement vehicle_update_traveling 2015-12-05 10:49:20 +00:00
duncanspumpkin
3204b52d1e Implemented vehicle_update_test_finish and vehicle_test_reset 2015-12-05 10:49:19 +00:00
duncanspumpkin
a0e1c16f48 Minor refactor 2015-12-05 10:49:18 +00:00
duncanspumpkin
371dec1c17 Fix bugs and finish departing station implementation 2015-12-05 10:49:18 +00:00