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
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
Duncan
bcc7e2f5a1
Merge pull request #2147 from Overv/develop
...
Fix confusing errors appearing when building a flat ride partially outside the park #2129
2015-11-09 12:39:41 +00:00
Ted John
03cbb37d8a
Merge Localisation/master into OpenRCT2/develop.
2015-11-09 04:00:16 +00:00
IntelOrca
bbd5e6dbe3
Merge branch 'master-server-improvements' into develop
2015-11-08 23:50:59 +00:00
IntelOrca
09cd007f3f
add dedicated flag to gameInfo
2015-11-08 23:50:38 +00:00
IntelOrca
da6d382c47
make server heartbeat PUT
2015-11-08 23:29:52 +00:00
Alexander Overvoorde
3f00ec42f1
Replace trackPlaceZ RCT2_GLOBALs with define for clarity
2015-11-08 23:44:41 +01:00
IntelOrca
2e55495470
improve master server to POST json
2015-11-08 22:03:35 +00:00
Alexander Overvoorde
6114aa5dac
Rename hmm variable to something more descriptive
2015-11-08 22:30:51 +01:00
Alexander Overvoorde
b20a844982
Fix "land not owned" errors being overridden by "can't construct here"
...
I'm not entirely sure what the "hmm" check is about, but it caused
track_place() to return early when called from
window_ride_construction_construct(), so I moved up the owned land check
to give it a higher priority.
2015-11-08 21:47:18 +01:00
Alexander Overvoorde
d1a6b65049
Fix supports error appearing when building outside of owned land
...
This was caused by ride_construction_toolupdate_construct() pointlessly
trying to fix the "building outside owned land" error by increasing the Z.
2015-11-08 21:47:17 +01:00
