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

4597 Commits

Author SHA1 Message Date
Ted John fe4b4516fd Merge pull request #2006 from zsilencer/develop 
linux fixes
 2015-10-02 23:20:45 +01:00
Ted John 2dfcbd82a1 Merge pull request #2007 from janisozaur/platform 
Platform name
 2015-10-02 23:19:00 +01:00
zsilencer ffee5229b5 fix directories in linux 2015-10-02 14:48:10 -06:00
Michał Janiszewski 8a5d9bf614 Platform name 2015-10-02 21:19:20 +02:00
zsilencer 5793ded423 mouse drag in linux 2015-10-02 09:51:34 -06:00
Ted John a9b3b8fe8e Merge pull request #2003 from JarnoVgr/develop 
Improved support for VS version selector
 2015-10-02 13:31:07 +01:00
Ted John dbeaed692b Merge pull request #2004 from runelaenen/save-ask-filename 
Fix issue 1942
 2015-10-02 13:29:23 +01:00
Rune Laenen 7934e2efd2 Fix issue 1942 2015-10-02 14:16:02 +02:00
JarnoVgr 00949686c2 Improved support for VS version selector 
Version selector defaulted to VS2013 (12.0) instead of VS2015 (14.0).
 2015-10-02 14:04:42 +02:00
Duncan 1590fa730b Merge pull request #2002 from runelaenen/var_2A-outside_of_park 
var_2A to outside_of_park
 2015-10-02 12:53:02 +01:00
Rune Laenen 7ac930c318 errorfix guest_list 2015-10-02 13:49:13 +02:00
Rune Laenen 1b5e55d346 newPeep fix 2015-10-02 13:45:17 +02:00
Rune Laenen 5d75fa4464 var_2A to outside_of_park 2015-10-02 13:41:13 +02:00
Duncan 35dbf5adcf Merge pull request #1998 from duncanspumpkin/place_park 
Implement game_command_place_park_entrance
 2015-10-01 22:04:14 +01:00
duncanspumpkin 33e04b8bd6 Implement game_command_place_park_entrance 2015-10-01 21:24:24 +01:00
Ted John 0da5deff29 Merge pull request #1996 from janisozaur/hooks 
Add hooks for Linux
 2015-10-01 18:39:15 +01:00
Michał Janiszewski 9a1e88872f sub_6E7FF3 no longer causes problems 2015-10-01 18:57:45 +02:00
Michał Janiszewski df52bb5ca1 Add hooks for Linux 2015-10-01 18:49:13 +02:00
Ted John 57332a71fd Merge pull request #1990 from duncanspumpkin/set_peep_name 
Set peep name game command
 2015-10-01 08:15:41 +01:00
duncanspumpkin f40ccc883a Name remaining peep cheat flag enums 2015-09-30 22:01:44 +01:00
duncanspumpkin b5711638bc Implement game_command_set_peep_name 
Note this is how most of the existing cheats are used
 2015-09-30 21:55:36 +01:00
Duncan f34902f5cf Merge pull request #1989 from duncanspumpkin/footpath_from_track 
Implement game command footpath from track.
 2015-09-30 20:48:07 +01:00
Duncan 1662a35df9 Merge pull request #1988 from janisozaur/travis 
Don't install recommended packages on travis
 2015-09-29 23:12:09 +01:00
Duncan a236e567fe Merge pull request #1987 from janisozaur/time 
platform time functions
 2015-09-29 23:09:15 +01:00
duncanspumpkin ecc2f74b63 Implement game command footpath from track. 
Fixes #1954
 2015-09-29 23:07:07 +01:00
Michał Janiszewski 50e484145a Don't install recommended packages on travis 
Old:
15 upgraded, 255 newly installed, 16 to remove and 82 not upgraded.
Need to get 62.7 MB of archives.
After this operation, 267 MB of additional disk space will be used.

New:
14 upgraded, 252 newly installed, 13 to remove and 83 not upgraded.
Need to get 61.1 MB of archives.
After this operation, 258 MB of additional disk space will be used.

The difference may look small, but when you see the list of affected
packages, you will notice that java installer is now skipped, which
shaves quite a big chunk of time wasted.

Skipped packages:
* libsasl2-modules
* libtxc-dxtn-s2tc0
* libx11-doc
* oracle-java8-installer
 2015-09-30 00:02:34 +02:00
Michał Janiszewski 89846a088a platform time functions 2015-09-29 23:35:15 +02:00
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