mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-08-29 13:36:07 +02:00
Code Issues Projects Releases Wiki Activity
5135 commits 9 branches 41 tags 334 MiB
Commit graph

5135 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ted John
562c9cb68e Merge Localisation/master into OpenRCT2/develop. 2015-11-20 04:00:18 +00:00
Ted John
e9deafa5df Merge Localisation/master into OpenRCT2/develop. 2015-11-19 04:00:17 +00:00
IntelOrca
67b6aa7513 fix #2330: Clear button in Object Selector doesn't refresh item list 2015-11-18 23:19:25 +00:00
duncanspumpkin
e05475cb38 Fix #2342. Accidentally disabled pause mode building for large scenery 2015-11-18 22:32:23 +00:00
Ted John
5609636db2 Merge pull request #2340 from janisozaur/optimize-fixes 
Fixes for building optimized binary on Linux
 2015-11-18 21:05:46 +00:00
janisozaur
d037b937d8 Fix VS project file 2015-11-18 21:57:01 +01:00
Michał Janiszewski
c4ad2346e3 Fixes for building optimized binary on Linux 
Use `-DCMAKE_BUILD_TYPE=X`, where X:
- `RELEASE`
- `RELWITHDEBINFO`
- `MINSIZEREL`

Only works for GCC, clang binaries crash for now.
 2015-11-18 21:29:08 +01:00
duncanspumpkin
6c8c5a157f Fix #2335. Increase land window size to show price correctly. 2015-11-18 17:48:14 +00:00
Duncan
e36ed5e732 Merge pull request #2325 from BodrickLight/refactor 
Refactor audio.c and audio.h
 2015-11-18 17:33:21 +00:00
Dom Light
55fb03fa75 Replace a call to audio_play_sound_panned 2015-11-18 14:01:29 +00:00
Ted John
b1a6836a2f Merge pull request #2336 from daihakken/patch-1 
Update language.cpp (CHT font)
 2015-11-18 08:29:24 +00:00
Harry Lam
0081fb8435 Update language.cpp (CHT font) 
Microsoft removed "MingLiu.ttc" in Windows 10 1511 for no reason. The alternative, "MingLiub.ttc" (which support more characters and existed since Vista (https://www.microsoft.com/typography/fonts/font.aspx?FMID=1772)) is kept instead.
 2015-11-18 13:54:22 +08:00
Ted John
64159d83d0 Merge Localisation/master into OpenRCT2/develop. 2015-11-18 04:00:17 +00:00