mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,945 Commits 9 Branches 40 Tags 379 MiB
Commit Graph

5945 Commits

Author SHA1 Message Date
Ted John 55f1032a9a Merge pull request #2547 from janisozaur/vehicle-update-merge 
Vehicle update merge
 2015-12-23 20:41:59 +00:00
Michał Janiszewski cd2ec16290 Merge branch 'develop' into vehicle-update 
Conflicts:
	openrct2.vcxproj.filters
	projects/openrct2.vcxproj
 2015-12-23 19:47:16 +01:00
IntelOrca 783cd2115a turn publish into tasks and fix nsis installer 2015-12-23 17:22:37 +00:00
IntelOrca 590923475b add quiet switch to install.ps1 2015-12-23 17:22:36 +00:00
duncanspumpkin 4c88609e7e Fix stretch backwards coasters 2015-12-23 11:57:50 +00:00
Ted John 578bf2e175 Merge Localisation/master into OpenRCT2/develop. 2015-12-23 04:00:18 +00:00
Ted John b7a92523e0 Merge pull request #2544 from janisozaur/move-scripts 
Move scripts to new location
 2015-12-22 23:02:30 +00:00
Michał Janiszewski d4d3c80b37 Move scripts to new location 2015-12-22 23:47:57 +01:00
Ted John b0647f1daf Merge pull request #2543 from LRFLEW/develop 
Added version.h to Xcode project
 2015-12-22 22:24:53 +00:00
LRFLEW 2e6056f988 Added version.h to Xcode project 2015-12-22 16:21:51 -06:00
IntelOrca b2d39bc67f update readme.md 2015-12-22 22:06:03 +00:00
Ted John a0b6bef545 Merge pull request #2542 from janisozaur/cmake-release 
CMake updates for packaging on Linux
 2015-12-22 22:01:58 +00:00
Michał Janiszewski 3ba9ec8c81 CMake updates for packaging on Linux 
This enables install and package targets for make.

You can specify installation prefix with -DCMAKE_INSTALL_PREFIX=path,
when doing `make install`, OpenRCT shall be found there.

You can also use `make package` for creating packaged release files.
 2015-12-22 22:47:44 +01:00
IntelOrca e3b4abd3c7 Merge branch 'improve-powershell-build' into develop 2015-12-22 21:42:23 +00:00
IntelOrca e95bd57e68 add installer creation in publish script 2015-12-22 21:31:29 +00:00
IntelOrca 73bca80426 setup AppVeyor CI 2015-12-22 21:31:28 +00:00
IntelOrca a3ed25d93f update Windows build steps in readme 2015-12-22 21:31:28 +00:00
IntelOrca 26908d8a9c move scripts into ps sub directory 2015-12-22 21:31:27 +00:00
IntelOrca cb5dab3e57 move projects and add environment setup script 2015-12-22 21:31:26 +00:00
IntelOrca dffcc895cf call build script from publish script 2015-12-22 21:31:26 +00:00
IntelOrca 5d393deb2e reorganise build location and write new build script for Windows 2015-12-22 21:31:25 +00:00
IntelOrca d8b949ecdc reorganise scripts 2015-12-22 21:31:17 +00:00
IntelOrca 0298ca38a0 improve project version defines and publish script 2015-12-22 17:46:20 +00:00
IntelOrca 00cba88dbc add powershell script for publishing OpenRCT2 2015-12-22 17:45:34 +00:00
Ted John 48320419ea Merge pull request #2538 from janisozaur/vehicle-update-merge 
vehicle-update merge
 2015-12-22 16:24:38 +00:00
Ted John 5d66308e9d Merge pull request #2541 from AaronVanGeffen/subst_typo 
Corrected misspellings of "substitute"
 2015-12-22 16:23:46 +00:00
Duncan fc301211c3 Merge pull request #2539 from janisozaur/vehicle-update-fixes 
fixes for issues in vehcile-update
 2015-12-22 16:16:50 +00:00
Michał Janiszewski 0903dda369 fixes for issues in vehcile-update 2015-12-22 17:00:21 +01:00
Aaron van Geffen 2c5651614c Corrected misspellings of "substitute". 2015-12-23 00:40:36 +09:00
Michał Janiszewski e666a24c82 Merge branch 'develop' into vehicle-update 
Conflicts:
	projects/openrct2.vcxproj.filters
	src/audio/mixer.cpp
	src/windows/ride.c
 2015-12-22 14:57:40 +01:00
duncanspumpkin 7f68149516 Minor Refactor 2015-12-22 10:27:38 +00:00
Ted John 8b9c4d1824 Merge Localisation/master into OpenRCT2/develop. 2015-12-22 04:00:19 +00:00
IntelOrca db18fa8f14 finally fix #1619: Can't place any path 
RCT2_ADDRESS_TOOL_WIDGETINDEX was being read as an int32 sometimes
 2015-12-21 22:28:34 +00:00
duncanspumpkin 27d38c6f39 Fix incorrect comparison for backwards loop. 2015-12-21 22:18:56 +00:00
Ted John 13ce4b6a23 Merge pull request #2531 from LRFLEW/warning-cleanup 
Fixed warnings in Xcode
 2015-12-21 21:36:24 +00:00
Ted John 569fd7771c Merge pull request #2532 from LRFLEW/newline 
Added newlines at end of files
 2015-12-21 21:36:05 +00:00
Ted John 39360e40a8 Merge pull request #2120 from janisozaur/linux 
Remove old Linux workarounds
 2015-12-21 21:35:52 +00:00
Ted John bdbb25f340 Merge pull request #2534 from janisozaur/server-no-description 
Safe handling of malformed server entries
 2015-12-21 21:35:45 +00:00
IntelOrca bc24393239 implement vehicle_update_motion_boat_hire 2015-12-21 21:33:17 +00:00
Michał Janiszewski d610fb5970 Remove call to 0x0040701D 2015-12-21 22:17:13 +01:00
Michał Janiszewski 5d227d8fc8 Safe handling of malformed server entries 
Refuse to add a nameless server or one without version specified, but
allow description missing.
 2015-12-21 22:14:24 +01:00
Michał Janiszewski 54424ea275 Remove old Linux workarounds 
Verified working on my machine.
 2015-12-21 21:52:42 +01:00
IntelOrca 3b7839c026 implement try_add_synchronised_station 2015-12-21 18:26:41 +00:00
duncanspumpkin 9d937b3475 Refactor of backwards get next track 2015-12-21 09:19:35 +00:00
LRFLEW 85800997c2 Fixed warnings in Xcode 2015-12-21 03:11:38 -06:00
Ted John dbb804018b Merge pull request #2528 from LRFLEW/osx-touch-why 
Fixed trackpad-as-touchscreen on OS X
 2015-12-21 08:27:38 +00:00
LRFLEW e6f771ec90 Added newlines at end of files 2015-12-20 22:03:37 -06:00
Ted John b6b18c812f Merge Localisation/master into OpenRCT2/develop. 2015-12-21 04:00:18 +00:00
LRFLEW 46e773736c Fixed trackpad-as-touchscreen on OS X 2015-12-20 21:12:14 -06:00
IntelOrca eab3e15182 improve touch positioning 2015-12-21 00:39:38 +00:00