Michał Janiszewski
b4b1624e08
Set path properly for OS X
2015-11-29 15:29:35 +01:00
Duncan
d00c124e52
Merge pull request #2364 from janisozaur/memory
...
Plug memory leaks, check memory accesses
2015-11-29 11:27:13 +00:00
Michał Janiszewski
ed21aeb3fc
Take care of strings in POSIX platform file
2015-11-29 12:19:13 +01:00
Michał Janiszewski
39cc16d137
Plug memory leaks, check memory accesses
2015-11-29 12:15:47 +01:00
Duncan
ada46ccc80
Merge pull request #2386 from LinusU/osx-platform
...
OS X platform
2015-11-29 11:10:35 +00:00
Duncan
ff0dc03671
Merge pull request #2393 from OpenRCT2/Gymnasiast-changelog
...
Fix typo in changelog
2015-11-28 16:00:19 +00:00
Michael Steenbeek
767333f0b4
Fix typo in changelog
2015-11-28 16:46:09 +01:00
Ted John
25552486dc
Merge pull request #2391 from OpenRCT2/Gymnasiast-changelog
...
Update changelog.txt
2015-11-28 12:34:51 +00:00
Michael Steenbeek
60719da852
Update changelog.txt
2015-11-28 13:33:23 +01:00
IntelOrca
cf1961b725
fix #2385 : Parks created with scenario editor do not have correct initial temperature
2015-11-28 12:24:19 +00:00
IntelOrca
7909ba1f3b
fix #2390 : Not fully implemented UTF-8 currencies in building/landscaping/etc.
2015-11-28 12:10:17 +00:00
Linus Unnebäck
859684142a
OS X platform implementation
2015-11-28 10:40:58 +01:00
Sam Parkinson
4eb55ac156
[Linux] Use system ca certs bundle
...
Curl automatically has a certs bundle on GNU/Linux, so providing
our own is not needed.
2015-11-28 10:56:23 +11:00
IntelOrca
c6056cbb6c
Merge branch 'pre-release-0.0.3' into develop
...
Conflicts:
src/audio/audio.c
2015-11-27 22:05:40 +00:00
duncanspumpkin
843999997b
Fix #2375 . Issue caused by invalid z coordinate for invalidate.
...
Also fixed a couple other functions which were calling with the incorrect z value
2015-11-27 19:17:35 +00:00
Ted John
7fc8b453d6
Merge pull request #2387 from duncanspumpkin/fix_2381
...
Map animation invalidate now called during pause mode
2015-11-27 18:56:26 +00:00
IntelOrca
674ff839bb
add icons to server list for password and version
2015-11-27 18:54:59 +00:00
duncanspumpkin
691aec5035
Fix #2381 . Map animation invalidate now called during pause mode
...
This was causing the number of map animations to skyrocket as there was no way to remove animations caused by ghosts. This shouldn't progress the animation only remove invalid animations.
2015-11-27 18:40:37 +00:00
duncanspumpkin
119ca58cc7
Add check to prevent exceeding the maximum number of animations. Probable cause of #2381
2015-11-27 18:01:45 +00:00
Ted John
c63eef9a21
Merge pull request #2378 from IntelOrca/support-unicode-currencies
...
support unicode currencies with ascii fallback
2015-11-27 17:56:44 +00:00
Ted John
c133171e12
Merge pull request #2017 from LinusU/clang-headers
...
include correct headers
2015-11-27 17:27:30 +00:00
Linus Unnebäck
30b6718532
start of OS X support
2015-11-27 17:43:12 +01:00
Ted John
9b1e1249c3
Merge Localisation/master into OpenRCT2/develop.
2015-11-27 04:00:18 +00:00
Ted John
a8d837ea76
Merge pull request #2383 from OpenRCT2/fahrenheit
...
UK: Missed occurrence of the Fahrenreit symbol
2015-11-26 22:48:02 +00:00
Michael Steenbeek
ceeedc50cd
UK: Missed occurrence of the Fahrenreit symbol
...
Thanks to @e-foley for pointing it out.
2015-11-26 23:38:24 +01:00
IntelOrca
7ea0e2d6a3
improve language load fail behaviour
...
improve currencies
fix bug in supported glyph check
2015-11-26 18:28:52 +00:00
Ted John
4aeed736b0
Merge pull request #2379 from OpenRCT2/fahrenheit
...
UK: Fahrenheit degree symbol
2015-11-26 17:59:20 +00:00
Michael Steenbeek
99a91b11c5
UK: Fahrenheit degree symbol
2015-11-26 16:36:36 +01:00
IntelOrca
46924bc9eb
support unicode currencies with ascii fallback
2015-11-25 22:31:00 +00:00
duncanspumpkin
83d183954a
Fix #2337 . Fixed footpath placements with walls.
2015-11-24 20:10:03 +00:00
Ted John
f3bca21061
Merge pull request #2374 from JarnoVgr/develop
...
Updated readme.md links
2015-11-24 17:39:36 +00:00
JarnoVgr
2354957995
Re-added rct subreddit
2015-11-24 18:34:04 +01:00
JarnoVgr
271c7be3b5
Updated readme.md links
...
Added forums link, removed voat link (no one used it), removed link to
'rct' subreddit (there's a 'openrct' subreddit link)
2015-11-24 16:16:31 +01:00
Ted John
c89561a81a
Merge pull request #2372 from zsilencer/bugfixes
...
Fix #2352
2015-11-23 21:24:46 +00:00
zsilencer
0c3c9d5400
Fix #2352 . Do not open disconnected status window when password input canceled.
2015-11-23 13:07:18 -07:00
duncanspumpkin
cba189c2de
Fix #2326 . Fixed research bugging out when going back to object selection
2015-11-23 18:25:43 +00:00
Ted John
84e831b256
Merge pull request #2370 from daihakken/revert-2336-patch-1
...
Revert "Update language.cpp (CHT font)"
2015-11-23 08:40:18 +00:00
Harry Lam
e528e32ec0
Revert "Update language.cpp (CHT font)"
2015-11-23 16:26:18 +08:00
Ted John
e7655b059a
Merge Localisation/master into OpenRCT2/develop.
2015-11-22 04:00:18 +00:00
Ted John
9a71321714
Merge pull request #2362 from e-foley/downward_launch_ratings
...
fix #2361
2015-11-22 02:26:35 +00:00
e-foley
523ee27355
add e-foley to contributors
2015-11-21 18:17:27 -08:00
e-foley
b147fd3a90
make speed affect upward launch ratings only
2015-11-21 18:17:26 -08:00
IntelOrca
c6308dcb41
stop ride window from opening when there is a vehicle crash on the title screen
2015-11-21 13:40:00 +00:00
Ted John
7474515e5c
Merge Localisation/master into OpenRCT2/develop.
2015-11-21 04:00:17 +00:00
Ted John
c4791ede7f
Merge pull request #2353 from IntelOrca/track-paint-shop
...
Implement paint function for food, drink, souvenir and ATMs
2015-11-20 23:59:47 +00:00
IntelOrca
1ff2d68061
implement track paint shop
...
implement track paint shop, part 2
implement track paint shop, part 3
implement track paint shop, part 4
2015-11-20 22:53:53 +00:00
IntelOrca
5a9a372100
change branch name - this should have been done when branch was created :/
2015-11-20 21:40:37 +00:00
duncanspumpkin
5bd3b8d6af
Implement util_rand due to rand having a poor range on some platforms
2015-11-20 21:40:36 +00:00
IntelOrca
5ef10f5050
fix memory leaks in JSON object creation for multiplayer
2015-11-20 18:48:40 +00:00
duncanspumpkin
bd262d9c59
Fix #2308 . ShopItem was accidentally passed into new_thought instead of thought_type
2015-11-20 17:12:26 +00:00
