Cameron
763a5f2938
Restore newline at end of file
2015-11-15 15:50:36 -06:00
Cameron
1fc7793c2a
Clean up and match coding style
2015-11-15 15:48:27 -06:00
duncanspumpkin
54d7b54cb3
Merge branch 'pre-release-0.0.3' into develop
2015-11-15 21:23:01 +00:00
duncanspumpkin
82498c4a57
Fix #1922 . Corrected invalid viewport code.
...
ACTIVE_VIEWPORT_PTR_ARRAY should be iterated along checking for a NULL pointer. To indicate the list end. Removed NEW_VIEWPORT macro as its description was incorrect.
2015-11-15 21:05:30 +00:00
U-HP-Pavilion-PC\Cameron
e5ad14e3f5
Finished decompiling
2015-11-15 12:20:01 -06:00
duncanspumpkin
eaa2d10ec4
Fix #2070 . Incorrect highest drop penalty height caused incorrect calculations
2015-11-15 18:11:49 +00:00
Duncan
2a54a98937
Merge pull request #2304 from janisozaur/iconv
...
Make OpenRCT2 use iconv on Linux
2015-11-15 17:18:36 +00:00
U-HP-Pavilion-PC\Cameron
cfdc0cf057
More refactoring
2015-11-15 11:01:34 -06:00
Michał Janiszewski
7ba9ea2574
Make OpenRCT2 use iconv on Linux
...
This makes possible to run the game with non-english locales on Linux
Fixes #2300 , fixes #2268 , fixes #2267
2015-11-15 17:12:32 +01:00
duncanspumpkin
b7d402cfbe
Implement right click scrolling for scroll widgets.
...
Think this had just been missed. Its heavily modified from the original to match closer to what the rest of the code base does. Fixes #2052 .
2015-11-15 13:55:09 +00:00
Duncan
317c2f7c7d
Merge pull request #2302 from Gymnasiast/cestina
...
Add Czech and fix some typos
2015-11-15 11:44:42 +00:00
Gymnasiast
8953357f85
Add Czech and fix some typos
2015-11-15 12:30:13 +01:00
duncanspumpkin
485705f1cb
Fix incorrect parameter type
2015-11-15 10:05:22 +00:00
duncanspumpkin
faf5d9a043
Fix #2301
...
Lanaguages were not falling back if there was a translated string further on in the langauge pack. This issue was caused by operating on an invalid string that was masked by a cast from a nullpointer to a size_t. The code now will not set the string if there is a nullptr
2015-11-15 09:55:01 +00:00
duncanspumpkin
cd07fd5d4e
Fix #1565 . Construction window now checks to see if it has control of tool before canceling it
2015-11-15 09:12:19 +00:00
duncanspumpkin
97fc78a506
Fix safe_strncpy being unsafe
2015-11-15 08:45:50 +00:00
U-HP-Pavilion-PC\Cameron
0a824d0957
saving my work
2015-11-14 22:45:13 -06:00
Ted John
bcd14ad586
Merge Localisation/master into OpenRCT2/develop.
2015-11-15 04:00:16 +00:00
duncanspumpkin
8d2641a2a1
Fix mistake in last commit
2015-11-14 16:45:42 +00:00
duncanspumpkin
13e43b779b
Refactor large scenery placement
2015-11-14 16:44:03 +00:00
Michał Janiszewski
e885056229
Fix exit code handling, sprite generation
...
Make sprite generation not start UI
2015-11-14 17:43:03 +01:00
Michał Janiszewski
e7b58b7375
Skip closing network if already closed
...
Fixes #2203
2015-11-14 17:12:38 +01:00
duncanspumpkin
331d75e5f7
Fix signs. Broken by #2172
2015-11-14 12:40:40 +00:00
duncanspumpkin
bdd29107e6
Refactoring
2015-11-14 11:56:13 +00:00
Ted John
32b1171b2f
Merge Localisation/master into OpenRCT2/develop.
2015-11-14 04:00:26 +00:00
U-HP-Pavilion-PC\Cameron
f9b1a9eeb4
Refactor some more and fix #2264
2015-11-13 19:50:20 -06:00
duncanspumpkin
954d6348b2
Fix change in function name
2015-11-14 00:12:19 +00:00
duncanspumpkin
d0332c81d8
Refactor and move wide flag code.
2015-11-14 00:08:31 +00:00
duncanspumpkin
45c4dfe12d
Merge branch 'develop' into pre-release-0.0.3
2015-11-13 23:30:13 +00:00
Duncan
3d59186e24
Merge pull request #2298 from janisozaur/lodepng-update
...
Update lodepng to 20151024
2015-11-13 22:51:42 +00:00
Duncan
bc9a28d7ae
Merge pull request #2261 from osconnoisseur/fix_2233
...
Add buttons for Up and New File in the load/save dialog and fix #2233
2015-11-13 22:50:46 +00:00
Michał Janiszewski
44e3e74a65
Change pre-built link to http://openrct2.website/
2015-11-13 23:33:24 +01:00
U-HP-Pavilion-PC\Cameron
e2545599ed
Converted to sentence case and removed brackets from STR_2718 and 2719 in english_uk.txt
2015-11-13 16:25:52 -06:00
U-HP-Pavilion-PC\Cameron
557a89928c
Revert "Converted to sentence case and removed brackets from STR_2718 and STR_2719"
...
This reverts commit 7aa8e6040e
.
2015-11-13 16:23:16 -06:00
U-HP-Pavilion-PC\Cameron
7aa8e6040e
Converted to sentence case and removed brackets from STR_2718 and STR_2719
2015-11-13 16:08:33 -06:00
U-ASUS-EEEPC\Cameron Hall
2cd40b025a
Fixed one of my bugs and did some refactoring. Still more refactoring to do...
2015-11-13 13:48:21 -06:00
Duncan
65a3dd710a
Merge pull request #2299 from janisozaur/g2
...
Zero the buffer for g2.dat
2015-11-13 18:40:00 +00:00
Duncan
86fdd6d1f6
Merge pull request #2280 from janisozaur/highdpi
...
Highdpi
2015-11-13 18:39:24 +00:00
duncanspumpkin
aa55ca6b62
Refactor banner_remove. Fixed an original bug.
...
Banners that are placed on two different heights that face the same direction will end up bugging out. This has now been fixed. This required modification of the top toolbar code in order to correctly set the z variable.
2015-11-13 18:30:14 +00:00
Duncan
8a3b4a9bb7
Merge pull request #2295 from osconnoisseur/platform_enumerate_directories_begin
...
Fixed off-by-one errors in string conversion
2015-11-13 18:17:33 +00:00
Michał Janiszewski
60f7d29c2e
Zero the buffer for g2.dat
...
Some leftover data caused the g2.dat generated on different platforms to
have mismatching cheksums. Zeroing the buffer makes them
checksum-identical.
2015-11-13 14:43:08 +01:00
Michał Janiszewski
4bf9680b43
Update lodepng to 20151024
...
https://transfer.sh/11TTTm/orctlibs.zip
https://transfer.sh/y9wvx/orctlibs-vs.zip
2015-11-13 11:52:13 +01:00
U-HP-Pavilion-PC\Cameron
0757b09781
refactor
2015-11-12 22:47:36 -06:00
Ted John
8bcf2e1b8c
Merge Localisation/master into OpenRCT2/develop.
2015-11-13 04:00:17 +00:00
U-ASUS-EEEPC\Cameron Hall
9cf2783785
Initial work. Decompiled up to 0x663BE4
2015-11-12 17:02:04 -06:00
Duncan
1963d98a71
Merge pull request #2291 from janisozaur/fixes
...
Minor cleanups
2015-11-12 21:40:57 +00:00
Cameron
fe4d98bc83
Fixed off-by-one errors in string conversion
2015-11-12 13:36:16 -06:00
duncanspumpkin
a0014eee09
Refactor set scenery and fence.
2015-11-12 19:22:08 +00:00
Michał Janiszewski
6723f51087
Keep track of address returned by malloc to free it correctly
...
When doing g2 generation on Linux, src variable was not modified in the
same way as on Windows, which caused free() on a pointer that was not
malloc()ed.
This fixes #2219 .
2015-11-12 14:11:22 +01:00
Michał Janiszewski
b5b1957f58
Fix some left-shifts
...
An explicit `1` is considered signed by compiler, if `int` is 32 bit
long, a left shift `1 << 31` is undefined. Since the type of result is
the type of left shift operand, make sure we shift unsigned int so that
the behaviour is defined correctly.
Also one fix in peep code, where it would use too big value for
`item_extra_flags`.
2015-11-12 13:38:10 +01:00