Commit graph

5061 commits

Author SHA1 Message Date
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
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
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
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
duncanspumpkin
83d183954a Fix #2337. Fixed footpath placements with walls. 2015-11-24 20:10:03 +00:00
duncanspumpkin
cba189c2de Fix #2326. Fixed research bugging out when going back to object selection 2015-11-23 18:25:43 +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
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
duncanspumpkin
6c8c5a157f Fix #2335. Increase land window size to show price correctly. 2015-11-18 17:48:14 +00:00
duncanspumpkin
6d3eaafe2f Fix #2327. Fix no entry signs.
Issue was caused by mistakenly not stopping searching for tiles after finding the correct one. Mistake made during refactoring
2015-11-17 19:04:43 +00:00
Alexander Overvoorde
0f065cf4a9 Add string ids for scenario name window 2015-11-16 20:30:38 +00:00
Alexander Overvoorde
b83e570230 Fix length of max scenario name in scenario editor 2015-11-16 20:30:26 +00:00
duncanspumpkin
c1ed727067 Fix #2305. Fences now build correctly with shift.
Issue was caused by failing to reinitialise a variable and reusing a variable name for two different purposes. It has been fixed by nameing the variable and also initialising it.
2015-11-16 20:19:58 +00:00
Duncan
ca874e102b Merge pull request #2312 from zsilencer/bugfixes
Fix #2311
2015-11-16 18:49:42 +00:00
zsilencer
292b67874f Fix #2311. Water no longer is able to be raised above existing map elements. 2015-11-16 10:38:20 -07: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
duncanspumpkin
eaa2d10ec4 Fix #2070. Incorrect highest drop penalty height caused incorrect calculations 2015-11-15 18:11:49 +00: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
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
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
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
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
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
Ted John
8bcf2e1b8c Merge Localisation/master into OpenRCT2/develop. 2015-11-13 04:00:17 +00:00
Duncan
1963d98a71 Merge pull request #2291 from janisozaur/fixes
Minor cleanups
2015-11-12 21:40:57 +00:00