mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,245 Commits 7 Branches 39 Tags 352 MiB
Commit Graph

3904 Commits

Author SHA1 Message Date
Kyle Kirby 8e5355640f Convert spaces to tabs 2015-12-11 06:28:35 -06:00
LRFLEW c9be2e1bc9 Resolved struct packing error and crash on OS X 2015-12-10 17:29:58 -06: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
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
Ted John 1d3cefe73d Merge pull request #2427 from xperia64/develop 
Add symbolic link support
 2015-12-05 21:34:44 +00: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
IntelOrca b1bb72c833 Merge branch 'master' into develop 
Conflicts:
	src/rct2.h
 2015-12-04 21:16:43 +00:00
IntelOrca 673796eb6c Merge branch 'pre-release-0.0.3.1' 2015-12-04 21:09:43 +00:00
IntelOrca 9c19d689c2 fix #2434: Dropdown menus linger when toolbars are toggled 2015-12-04 19:02:24 +00:00
IntelOrca 737baf8b78 fix #2158: Video Freeze when window is maximised, minimised and then restored 2015-12-04 18:59:59 +00:00
duncanspumpkin 11398cf60f Fix warning. 2015-12-04 16:57:43 +00:00
xperia64 562d7fdb61 Add symbolic link support 2015-12-03 00:20:04 +00:00
duncanspumpkin 8eb313f852 Fix #2417 also fixed some surface pathfinding bugs. 
Guests were ignoring fences when surface pathfinding even when there was an available exit. Missing &= 3 was causing the assert to trigger.
 2015-12-02 18:59:00 +00:00
IntelOrca 9426170918 fix #2425: ride campaign list corrupted if over 40 rides 2015-12-02 17:50:32 +00:00
Michał Janiszewski 796021cfdc fix suspicious left shifts 
See b5b1957f5
 2015-12-02 08:32:15 +01:00
Michał Janiszewski d1b6d175c7 Make each platform set its own exe path 2015-12-01 21:38:35 +01:00
IntelOrca 60300dcece update version and branch 2015-12-01 18:30:04 +00:00
IntelOrca 8de299cc06 fix #2415: day / night cycle not working 2015-12-01 18:26:02 +00:00
Hielke Morsink 65a0dcbc8a Fixed #2407 - Prevent prompt from showing shortly after loading a second park. 2015-12-01 18:21:47 +00:00
Gymnasiast 3f6990dac9 Add close button to track designs manager, closes #1807 2015-11-30 22:53:28 +01:00
Duncan 396e6f8fee Merge pull request #2297 from osconnoisseur/decompile-map_set_land_height 
Decompilation of map_set_land_height
 2015-11-30 20:35:50 +00:00
duncanspumpkin 1a9b96340c Merge OpenRCT2/master into OpenRCT2/develop 2015-11-30 18:55:32 +00:00
duncanspumpkin 93e0bc5a24 Merge OpenRCT2/pre-release-0.0.3 into OpenRCT2/master 2015-11-30 18:53:57 +00:00
duncanspumpkin d91a9c965c Fix #2405. Foundations under shops now correctly drawn. 
Issue was caused by a mistake in implementation
 2015-11-30 18:00:33 +00:00
IntelOrca df1f5bad00 fix #604: mute toilet flush sfx on title screen 2015-11-29 17:19:16 +00:00
duncanspumpkin b9f7f6f4a2 Fix #2395. Fix pressing construct twice 2015-11-29 17:18:42 +00:00