Ted John
d293616bbc
Merge branch 'fix/intro' into develop
2016-05-13 21:36:24 +01:00
Ted John
b58766aa3f
clean up the logo and make it scalable
...
- fixes #1776 : graphical glitches on intro
- fixes #708 : screen turns white when resizing intro
2016-05-13 21:36:07 +01:00
Ted John
bf39225ca6
fix intro sound
2016-05-13 19:01:24 +01:00
Ted John
f901ec4aa8
fix intro drawing
2016-05-13 18:37:00 +01:00
YJSoft
f330ae478b
Add more font config to config.ini ( #3582 )
2016-05-13 18:23:11 +01:00
Ted John
0710eb7e87
Merge pull request #3585 from janisozaur/fixes
2016-05-13 18:22:20 +01:00
janisozaur
ca430e1b23
Drop unused variables ( #3586 )
2016-05-13 18:21:58 +01:00
Michał Janiszewski
4d05c939cf
Cache accesses to get_current_rotation()
2016-05-13 13:34:27 +02:00
Michał Janiszewski
070f298878
Make sure variables don't end up uninitialised
2016-05-13 13:23:37 +02:00
Michał Janiszewski
16fd91f786
Don't copy the error message to fixed-size buffer
2016-05-13 12:09:06 +02:00
janisozaur
feb140b84c
Revert part of last commit unsuitable for older compilers ( #3584 )
...
Also initialise all the items in gResearchedTrackTypesA and
gResearchedTrackTypesB
2016-05-13 10:36:24 +01:00
janisozaur
87d05f8a89
Fix compiler warnings ( #3583 )
...
Includes:
* type casting
* properly counting fields to initialise
2016-05-13 08:05:12 +01:00
OpenRCT2 git bot
a675192bdf
Merge Localisation/master into OpenRCT2/develop.
2016-05-13 04:00:19 +00:00
janisozaur
658e877955
Name all the typdef-ed structs ( #3581 )
2016-05-12 22:57:40 +01:00
Michael Steenbeek
9fac7f38a5
Return failure when encountering unknown lang code, fixes #3524 ( #3579 )
2016-05-12 20:48:40 +01:00
janisozaur
774bbdcbe8
Cast left-shifted values ( #3574 )
2016-05-12 18:09:19 +01:00
YJSoft
2f36dbf7e3
Add font config at config.ini ( #3569 )
2016-05-12 12:47:30 +01:00
Hielke Morsink
9c95803643
More robust track_design_open ( #3573 )
2016-05-12 12:46:57 +01:00
Harry Lam
755485f9b8
Fix inconsistency, US usage and confusion in en-GB ( #3570 )
...
[ci skip]
- I changed 5829 because there are actually rough exchange rate (1:10/100) in the currency.c/h.
- In my opinion, 5853/54 require discussion.
2016-05-12 07:25:59 +02:00
OpenRCT2 git bot
7c7dea8f00
Merge Localisation/master into OpenRCT2/develop.
2016-05-12 04:00:21 +00:00
Ted John
1229cbd540
clean up s6 struct a bit
2016-05-11 22:30:25 +01:00
Ted John
56da56b374
add global for gPeepWarningThrottle
2016-05-11 22:30:24 +01:00
duncanspumpkin
3b8a0c56e1
Use return value of paint funcs. Fix issue with support function
2016-05-11 21:21:05 +01:00
Duncan
c9883ef5be
Merge pull request #3339 from marijnvdwerf/paint-setup/decompile-98199C
...
Decompile sub_98199c
2016-05-11 21:12:18 +01:00
Ted John
30a044ae72
add globals for gWeeklyProfitAverage...
2016-05-11 19:41:34 +01:00
Ted John
0f1028c92c
add global for gResearchedSceneryItems
2016-05-11 19:41:33 +01:00
Marijn van der Werf
019155a496
Apply suggestions from PR
2016-05-11 18:40:13 +01:00
Michael Steenbeek
e45578771e
Add Czech to .desktop file
2016-05-11 14:02:25 +02:00
janisozaur
deeafc5a60
Add `--silent-breakpad` switch, fixes #3535 ( #3544 )
2016-05-11 12:25:21 +01:00
Ted John
62a7dd927e
Merge pull request #3560 from Overv/fix-user-formatting
...
Fix formatting characters in user strings (fixes #2892 )
2016-05-11 12:24:25 +01:00
Ted John
4298f416d2
fix #3558 : safely read chunks from S6 files
...
It appears many saved games have been saved with excess uncompressed data that overflows the S6 structure. This may have been caused by a save bug in an earlier version of OpenRCT2. This will now cap the uncompressed data to the amount expected.
2016-05-10 21:39:12 +01:00
marcovmun
d979e2b607
Scenery window scrolls wrongly fixes #3210 ( #3215 )
2016-05-10 20:58:24 +01:00
duncanspumpkin
e47684bf53
Fix image offset by 1 error.
2016-05-10 20:43:18 +01:00
Duncan
04b3103fa9
Merge pull request #3548 from zsilencer/paint-setup/river-rapids
...
Remaining vehicle paint setups
2016-05-10 19:34:45 +01:00
zsilencer
6761751f3f
Suggested review changes
2016-05-10 11:53:33 -06:00
Ted John
f38cde8f9b
fix #3556 : add rest of constant data for RideTypePossibleTrackConfigurations
2016-05-10 18:34:05 +01:00
Alexander Overvoorde
f22257056c
Remove formatting from loaded user strings
2016-05-10 14:16:48 +02:00
Alexander Overvoorde
85a2614a6a
Fix pasting of formatting characters being allowed and fix memory leak
2016-05-10 14:12:06 +02:00
Michael Steenbeek
8efdf4e960
Typo
2016-05-10 10:41:32 +02:00
OpenRCT2 git bot
5636e6a130
Merge Localisation/master into OpenRCT2/develop.
2016-05-10 04:00:18 +00:00
Ted John
aa929e1593
add globals for researched things, cleanup
2016-05-10 00:00:59 +01:00
Ted John
b5c0913b76
add global macros for a few more things, ride rating related and misc
2016-05-09 22:54:22 +01:00
Ted John
5162bc5a0e
add global macro for a few ride variables and expenditure table
2016-05-09 22:11:56 +01:00
Ted John
3c3a37073d
add global macro for gSamePriceThroughoutPark
2016-05-09 21:18:44 +01:00
Ted John
275f7c6723
add global macro for gCurrentExpenditure, gCurrentProfit
2016-05-09 21:12:01 +01:00
Ted John
3105d62d3b
add global macro for gTotalAdmissions, gTotalIncomeFromAdmissions
2016-05-09 21:05:17 +01:00
Ted John
be2d1127f5
add global macro for gResearchLastItemSubject
2016-05-09 20:38:26 +01:00
janisozaur
e28d6634fd
Allow builds without -fno-omit-frame-pointer ( #3554 )
...
Disables optimizations done to addresses.c, so frame pointer doesn't
have to be kept, allowing for more aggressive optimizations to be done.
2016-05-09 20:24:37 +01:00
janisozaur
d7a51aadee
Sanity checks for RCT1 SC4 import ( #3551 )
2016-05-09 19:13:21 +01:00
zsilencer
05213e4cfb
Decompile remaining vehicle splash effects
2016-05-09 09:41:12 -06:00