Commit Graph

4620 Commits

Author SHA1 Message Date
Duncan 6318d468b5 Merge pull request #1985 from Philpax/patch-2
Correct full name in contributors.md
2015-09-29 06:59:46 +01:00
Ted John d6631e182b Merge Localisation/master into OpenRCT2/develop. 2015-09-29 04:00:16 +01:00
Ted John 78e43e7ca4 Merge pull request #1983 from janisozaur/docker32
Docker32
2015-09-28 23:23:09 +01:00
Michał Janiszewski 9e62198546 Partially revert c93c1c7, for mingw builds only
Conditionally restore old functionality which got broken for mingw
builds with commit c93c1c7. Allow building with old version of code, but
generate a warning when doing so.
2015-09-29 00:13:27 +02:00
Michał Janiszewski abb0acde41 sha256 versioning of library zip 2015-09-28 23:29:52 +02:00
Duncan 8811abd174 Merge pull request #1963 from janisozaur/develop
Platform, memory fixes
2015-09-28 21:45:09 +01:00
Michał Janiszewski 11bbf7c19e Use openrct.net mirror for the files 2015-09-28 22:44:09 +02:00
Michał Janiszewski da2f2827d1 Update VS library file
The only change done here was to move jansson.h one level up
2015-09-28 22:33:28 +02:00
Michał Janiszewski ec1366dd29 use docker for 32bit build 2015-09-28 21:48:41 +02:00
Michał Janiszewski a16de307d7 Refactor project build scripts
This is mostly refactoring of cmake scripts, but also touches build.sh
and install.sh. The cmake should be much more palatable now for major
Linux distributions.

At the same time, new configuration is introduced to Linux version, one
with Twitch enabled.

Please note, however, this change requires update of orctlibs.zip for
mingw builds.
2015-09-28 21:10:21 +02:00
Michał Janiszewski 5d1beb14c0 Platform, memory fixes 2015-09-28 19:35:06 +02:00
IntelOrca c6b0d0919d fix #1982 2015-09-28 18:10:41 +01:00
Ted John adebebe2d4 Merge Localisation/master into OpenRCT2/develop. 2015-09-28 04:00:17 +01:00
duncanspumpkin eaa44ab1e1 Fix #1854. Special track elements disable correctly.
Issue was caused by a change I asked to be done a month back. Dropdowns are awkward windows the global array for dropdown content should be populated before creating them but not anything else as that will get reset. In this case the disabled items were reset. The same happens for highlighted index if that is specified before window creation
2015-09-27 21:55:48 +01:00
duncanspumpkin 9e1e0748f3 Fix #1947. Maze entrances no longer modify hedges wrong.
> Issue was caused by incorrectly translating btr and bts to C. In addition the operation was on a word and not a byte so it wouldn't change the maze correctly for all rotations. I've also refactored the code to make it a bit easier to follow.
2015-09-27 21:33:19 +01:00
Duncan 286bf3eb4c Merge pull request #1981 from duncanspumpkin/fix_bugs
Fix bugs
2015-09-27 17:52:19 +01:00
duncanspumpkin a697606211 Fix #1718. Incorrect cursors on scroll widgets.
Issue was being caused by passing the incorrect x and y parameters due to missing a widget dereference. I've also moved the x/y coordinates of the hand open/close to closer match what it feels like.
2015-09-27 16:55:34 +01:00
duncanspumpkin 1a0fc46559 Fix #1723 issue caused by failing to return.
The logic would fall through to the ending code so that it would just make a beeline to the exit after walking to one corner.
2015-09-27 16:21:45 +01:00
Mithun Hunsur 9643bfe471 Correct full name in contributors.md
Was just looking through and noticed my name was wrong. Hope you don't mind!
2015-09-27 16:54:50 +10:00
Ted John 4643881389 Merge Localisation/master into OpenRCT2/develop. 2015-09-27 04:00:16 +01:00
Ted John 490836aff5 Merge pull request #1979 from nightroan/develop
As a multiplayer client, don't select the next track piece if is is unaffordable
2015-09-27 02:13:52 +01:00
nightroan 8d3f7600fb As a multiplayer client, don't select the next track piece if is is unaffordable. 2015-09-26 16:01:04 -07:00
IntelOrca a04663368e add two new date formats, y/m/d and y/d/m, closes #1900 2015-09-26 14:35:26 +01:00
IntelOrca 015c41f6ef fix #1744 2015-09-26 14:07:17 +01:00
IntelOrca 3835c8c109 fix inet_ntop signature issues 2015-09-26 13:48:24 +01:00
Ted John 319470a10a Merge pull request #1966 from nightroan/develop
Fixed #1939
2015-09-26 12:48:47 +01:00
nightroan bd51c7ed80 Fixed #1939 by adding a callback to delay selection of the next piece until the server sends back the placement command. 2015-09-25 23:57:15 -07:00
Ted John 7f7ef3484e Merge pull request #1971 from janisozaur/multiplayer
enable linux multiplayer build for travis
2015-09-24 19:03:37 +01:00
Michał Janiszewski fa5aa0a524 enable linux multiplayer build for travis 2015-09-24 20:03:12 +02:00
IntelOrca 077f3a1995 refactor RCT2 PE setup. 2015-09-24 19:03:11 +01:00
zsilencer 266f1c1e37 make multiplayer work in linux 2015-09-24 18:39:15 +01:00
IntelOrca c93c1c738a fix network warnings by using new functions over deprecated 2015-09-24 18:30:14 +01:00
Ted John f15ba8ed0f Update CONTRIBUTING.md 2015-09-24 13:03:44 +01:00
Ted John ec25b2f121 Merge pull request #1961 from zsilencer/develop
remove directsound and get sound working for linux native
2015-09-23 18:22:51 +01:00
zsilencer 9ac89c2b5e remove directsound and get sound working for linux native 2015-09-23 09:42:55 -06:00
Ted John 9b3c8f8c26 Merge pull request #1957 from YamaArashi/replace_numbers_with_constants
Replace numbers with constants
2015-09-23 06:36:16 +01:00
YamaArashi bc8bf39e1b paint setup current type constant 2015-09-22 15:43:42 -07:00
YamaArashi 7c8b0641d9 replace viewport flags numeric literals with constants 2015-09-22 15:30:19 -07:00
Ted John ab8121303a Merge pull request #1956 from janisozaur/linux-rel
Make it work on Linux
2015-09-22 23:19:15 +01:00
Michał Janiszewski 1bd8e11c0f Make it work on Linux
Right now the project is decompiled to the point where it is feasible to
try porting it to another platform. It doesn't work 100% correctly, but
it's nearing this state.

To port it to Linux I mmapped the openrct2.exe into expected places,
disabled two offending calls (RCT2_CALLPROC_EBPSAFE(0x0040701D) and
RCT2_CALLPROC_X(0x006E7FF3…)), replaced memory management routines
with generic ones and removed all the function-pointer calls.

A basic, non-exhaustive check is included to verify that memory is
loaded correctly in place.

That last bit is probably the most intrusive one, but had to be done, as
the calling convention on Linux differs from the one on Windows. It
could possibly be emulated (just like RCT2_CALLFUNC_X) until dependency
on exe is dropped.

It is possible to completely remove calls out to original code by
commenting out contents of RCT2_CALLFUNC_X, right now this will yield
working UI, but no rendering of peeps, rides or rest of world. This can
be used as a benchmark or test platform for correctness of
implementation. The data sections will still be required for now.

Assets are expected to be in specific places, so to launch it, following
needs to satisified:
* $build/data/ has to have contents of $RCT2/Data/
* $build/data/ (same as above) has to have contents of $repo/data/
* $build/ObjData/ has to have contents of $RCT2/ObjData/
* $build/../openrct2.exe has to be $repo/openrct2.exe (as of 976ea0d)
Keep in mind you can symlink stuff and that filesystems are case
sensitive!
You can copy more of required data to possibly improve your experience.

Pretty much all of this commit will possibly have to be reverted by the
time OpenRCT2 gains independence.

Remember to build with -DDISABLE_NETWORK=ON -DDISABLE_HTTP_TWITCH=ON
2015-09-23 00:04:40 +02:00
Ted John a5d85cd15f Merge pull request #1955 from janisozaur/fixes
Fixes
2015-09-22 23:02:47 +01:00
Michał Janiszewski 52e0b737be Drop initial null check from SafeFree
Both free and delete treat nullptr the same way: as a no-op [1][2].

Get rid of checking if the pointer passed is a null one before acting on
it.

See stackoverflow.com/q/154136/do-while-and-if-else-statements-in in
case you are wondering why is it done this way.

[1] http://www.cplusplus.com/reference/cstdlib/free/
[2] http://www.cplusplus.com/reference/new/operator%20delete/
2015-09-22 22:58:34 +02:00
Michał Janiszewski a3d407079f fix windows position clamping 2015-09-22 22:58:34 +02:00
Michał Janiszewski 8ec1054477 add missing parntheses 2015-09-22 22:58:34 +02:00
Michał Janiszewski 33d5e0b79f fix loop counter 2015-09-22 22:58:34 +02:00
Michał Janiszewski cf7c827d0d Fix possible null dereference and resource leak 2015-09-22 22:58:20 +02:00
Michał Janiszewski 5ceafd66a3 Fix memory leak in screenshot.c and guest.c 2015-09-22 22:58:20 +02:00
Ted John 976ea0d775 Merge pull request #1953 from janisozaur/file-not-found
Safely handle 'file not found' or wrong parameters
2015-09-22 08:20:02 +01:00
Michał Janiszewski 16eb4666ee Safely handle 'file not found' or wrong parameters
`platform_enumerate_files_begin` (and it directory counterpart) can
return `-1`, make sure we handle that value properly when passed on
to `platform_enumerate_files_next` and `platform_enumerate_files_end`
2015-09-22 08:33:40 +02:00
Ted John a0d5d592c2 Merge pull request #1951 from zsilencer/develop
fix #1944
2015-09-21 18:10:02 +01:00