Ted John
533e2cdf40
Merge pull request #2461 from janisozaur/readme
...
fix link pasted twice
2015-12-11 00:30:38 +00:00
Michał Janiszewski
e97c509ddb
fix link pasted twice
2015-12-11 00:59:49 +01:00
Ted John
39a6f95ce6
Merge pull request #2459 from janisozaur/readme
...
update readme.md with Linux build information
2015-12-10 22:03:25 +00:00
Michał Janiszewski
adce5cbbdd
update readme.md with Linux build information
2015-12-10 22:17:29 +01: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
c4356c1ecc
cmake: add iconv libraries
2015-12-10 09:35:38 +01: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
Ted John
1cc75f644c
Merge pull request #2453 from Gymnasiast/polish-ttf
...
Use Arial for Polish, as the sprite font misses several Polish letters.
2015-12-09 15:31:13 +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
Duncan
a7823bd958
Merge pull request #2451 from janisozaur/memcheck
...
POSIX: use mincore to detect impending doom
2015-12-09 00:01:18 +00: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
9d668cd6c4
Add change to changelog
2015-12-07 10:41:04 -06:00
Lucas Riutzel
56d6fd157e
added myself to contibutors
2015-12-07 10:41:04 -06: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
Duncan
1a46b8b6b6
Merge pull request #2441 from LinusU/track_manage-fixes
...
use RCT2_ADDRESS in track_manage.c
2015-12-06 17:54:23 +00: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
8e6c345be6
prepare distribution files for pre-release-0.0.3.1
2015-12-04 19:09:05 +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
Ted John
8d971d3e0e
Merge Localisation/master into OpenRCT2/develop.
2015-12-03 04:00:17 +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
594f3d3c74
add new cache file to .gitignore (introduced in VS2015 Update 1)
2015-12-02 17:53:01 +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
Ted John
abfc025c5a
Merge Localisation/master into OpenRCT2/develop.
2015-12-02 04:00:19 +00: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
