mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,026 Commits 7 Branches 39 Tags 355 MiB
Commit Graph

5026 Commits

Author SHA1 Message Date
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
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
Michał Janiszewski 075b98e209 Minor cleanups 
Mostly just setting variables to better define game state, with one
minor update of decompilation where an `or` instruction was used in
place of `mov` (in `sub_6CBCE2`).
 2015-11-12 12:19:40 +01:00
Ted John 3b4f05358d Merge pull request #2289 from PFCKrutonium/patch-4 
Update readme.md
 2015-11-12 08:46:22 +00:00
Krutonium e64fd158ab Update readme.md 2015-11-11 23:19:35 -05:00
osconnoisseur b5c04a79e5 Added buttons for "up" and "new file" and fixed #2233 2015-11-11 21:51:21 -06:00
Michał Janiszewski 80510c91bd Add ui option to change scale in run-time 
Doesn't let user go lower than 0.5f
 2015-11-12 01:18:42 +01:00
Michał Janiszewski 516cddcf97 Explicitly cast scaled values to avoid warnings 2015-11-12 01:17:32 +01:00
Michał Janiszewski 6e63519bce Make `scale` a float 
There's no problem in `scale` being a floating point value, however,
since it's only NN scaling so far, it looks best for integer values
 2015-11-12 01:16:21 +01:00
Michał Janiszewski 681723869f Enable display scaling, useful on highdpi screens 
This allows for NN-scaling of display, a much needed feature on highdpi
screens.

Scale can be set to positive integer value which will become a zoom
factor for whole rendered output.
 2015-11-12 01:16:21 +01:00
IntelOrca 4d50c362ba Merge branch 'pre-release-0.0.3' into develop 2015-11-11 22:41:43 +00:00
IntelOrca ed8e7c2d38 add extra server details on gameinfo packet 2015-11-11 22:39:04 +00:00
IntelOrca 7f541240e2 fix #2279, make game remember save path rather than filename 2015-11-11 21:37:26 +00:00
duncanspumpkin e857f2d3c8 Refactor set_banner and set_large_scenery 2015-11-11 20:24:59 +00:00
duncanspumpkin 6a00482d1f Fix #1834 & #2288. Non complete circuit tracks now save correctly. 
Issue was caused by a bit of code not iterating correctly backwards.
 2015-11-11 19:44:53 +00:00
Duncan 61af410b72 Merge pull request #2286 from Overv/fix_2284 
Fix title sequence script interpreter treating parameters as commands (fixes #2284)
 2015-11-11 19:23:57 +00:00
duncanspumpkin 47ca2c4c59 Merge branch 'fix_2284' of https://github.com/Overv/OpenRCT2 into pre-release-0.0.3 2015-11-11 19:21:26 +00:00
Alexander Overvoorde 74cc03ac06 Fix title sequence script interpreter treating parameters as commands (fixes #2284) 2015-11-11 15:17:43 +01:00
Ted John fb6a90affa Merge pull request #2283 from janisozaur/abs 
Use C++'s std::abs instead of C's to get floats
 2015-11-11 08:10:56 +00:00
Michał Janiszewski 2b02a04114 Use C++'s std::abs instead of C's to get floats 
C's abs() will only work on int values, only std::abs will get floats.
 2015-11-11 08:16:36 +01:00
duncanspumpkin 77699e99e5 Final fix of #2151. 
Large Scenery, land, water now also force a retry of track placement. Small scenery, walls do not block tracks so do not require this.
 2015-11-10 21:34:09 +00:00
IntelOrca 54ff0b2045 ride_with_colour_config_exists should ignore itself 2015-11-10 21:28:10 +00:00
IntelOrca c9de9aeee0 fix #2051, stop queue paths connecting to three different directions 2015-11-10 21:23:16 +00:00
duncanspumpkin 026dba0348 Fix issue with last commit. 
If large scenery was outside of selection area it would not have its flag reset. Now it will clear the flag for all large tiles. This could do with improving at some point in the future
 2015-11-10 19:38:48 +00:00
Ted John 1e21c56e38 Merge pull request #2276 from duncanspumpkin/fix_1539 
Fix #1539 Alternative
 2015-11-10 19:24:31 +00:00
duncanspumpkin e6c08fcdf4 Fix #1539. This is an alternative to @warp-10 's technique. 
Sets a flag when using the clear large scenery to prevent profit when destroying large scenery.
 2015-11-10 19:04:36 +00:00
duncanspumpkin 1f08f092dd Fix #2273 
This was also allowing bins to be paid for placing in a 4 connected tile
 2015-11-10 17:23:38 +00:00
Ted John 207e8e8008 Merge Localisation/master into OpenRCT2/develop. 2015-11-10 04:00:19 +00:00
Duncan 5b37f8c810 Merge pull request #2266 from janisozaur/linux-memory-setup 
Improve memory setup for Linux
 2015-11-09 21:25:43 +00:00
Michał Janiszewski 1bd665563b Improve memory setup for Linux 
DATASEG was mapped, but did not have its contents filled properly. It is
now done as the process expects it.

Extend memory checksum region to catch possible corruptions early.

Fixes #2063
 2015-11-09 22:11:46 +01:00
duncanspumpkin efb30a8121 Fix #2037. Issue caused by reseting the zoom difference before too early. 2015-11-09 18:48:03 +00:00
IntelOrca 501d36b16c format top spin seat position offset array 2015-11-09 18:39:22 +00:00
duncanspumpkin 2ee1e05408 Implemented seatpositionoffset. 2015-11-09 17:39:49 +00:00