Ted John
8bfde1f948
Merge pull request #2472 from kkirby/bugfix/osx1010
...
Fix a bug where argv will be replaced by the argparse library.
2015-12-14 14:36:51 +00:00
Kyle Kirbatski
c3185de49d
Fix a bug where argv will be replaced by the argparse library.
...
The argparse library takes the input, assigns it to `this->output`, and then writes a null pointer to it. This causes issues on OS X 10.10 because AppKit tries to read the arguments passed to the application, which the first argument is null.
2015-12-14 07:19:06 -06:00
Ted John
a423c6c458
Merge Localisation/master into OpenRCT2/develop.
2015-12-14 04:00:17 +00:00
Ted John
8e7b22ebfd
Merge pull request #2484 from janisozaur/linux-util
...
Include safe_strncpy declaration in linux.c
2015-12-13 22:54:17 +00:00
Michał Janiszewski
3bf659a9ea
Include safe_strncpy declaration in linux.c
...
Fixes at least one of #2483
2015-12-13 23:09:59 +01:00
Duncan
0604068aac
Merge pull request #2440 from LinusU/world-map-fixes
...
small fixes to world/map.c
2015-12-13 21:27:40 +00:00
Linus Unnebäck
017899c0d9
small fixes to world/map.c
2015-12-13 21:45:58 +01:00
Ted John
7007aef9cb
Merge pull request #2480 from LinusU/proper-types
...
use stdint types
2015-12-13 18:24:12 +00:00
Linus Unnebäck
a613de410a
use stdint types
2015-12-13 19:01:54 +01:00
Ted John
32a794731c
Merge Localisation/master into OpenRCT2/develop.
2015-12-13 04:00:17 +00:00
Ted John
3274826a45
Merge pull request #2474 from janisozaur/g2
...
Add g2 target for easy generation
2015-12-13 00:38:55 +00:00
IntelOrca
5c3bcda744
fix wrong output steam in cmdline_sprite
2015-12-13 00:28:25 +00:00
Michał Janiszewski
40059ced39
Add g2 target for easy generation
2015-12-12 23:28:56 +01:00
Duncan
e953eed95b
Merge pull request #2467 from kkirby/code-cleanup
...
Code cleanup
2015-12-12 20:13:29 +00:00
Kyle Kirbatski
4f03530e48
Clean up instances of 0x.. & 0x.. to 0x.., 0x..
2015-12-12 14:08:09 -06:00
Duncan
0a86b8c946
Merge pull request #2450 from janisozaur/mmap
...
POSIX: MAP_ANONYMOUS should have fd = -1
2015-12-12 08:23:50 +00:00
Duncan
fee65959e2
Merge pull request #2465 from LRFLEW/osx-config-move
...
Moved the configuration on OS X to ~/Library/Application Support/OpenRCT2
2015-12-12 07:38:11 +00:00
Ted John
3ed756d98c
Merge Localisation/master into OpenRCT2/develop.
2015-12-12 04:00:17 +00:00
LRFLEW
c2202f6260
Moved the configuration on OS X to ~/Library/Application Support/OpenRCT2
2015-12-11 18:02:58 -06:00
Kyle Kirby
caf07c2064
Clean up the comments a litte
...
• Make comment heads be /**
• Make rct2 addresses be double spaced indented
• Make there be a space afte rct2: and the address
• Make single-line rct2 addresses be full block comments
• Move description of method to top of comment
2015-12-11 16:19:46 -06:00
Kyle Kirby
8e5355640f
Convert spaces to tabs
2015-12-11 06:28:35 -06:00
Duncan
3ba4677bd9
Merge pull request #2456 from LRFLEW/osx
...
Finished fixing support for OS X
2015-12-11 08:54:47 +00:00
Ted John
5cacb8d0ec
Merge Localisation/master into OpenRCT2/develop.
2015-12-11 04:00:17 +00:00
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
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
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
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
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