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

5611 Commits

Author SHA1 Message Date
Jarno Veuger d77c1039dc Added support for buildnumbers in installer 2015-12-25 14:41:39 +01:00
Jarno Veuger 06528da61b Installed will be moved instead of copied 2015-12-25 14:05:21 +01:00
Aaron van Geffen 43e193ba10 Remove FontConfig as a required module on OS X. 2015-12-25 14:32:49 +09:00
Ted John 570c732355 Merge Localisation/master into OpenRCT2/develop. 2015-12-25 04:00:18 +00:00
Ted John 3820db35fe Merge pull request #2551 from janisozaur/fontconfig-docker 
Add docker fonctonfig library for #2546
 2015-12-24 19:18:33 +00:00
Michał Janiszewski 7edf477ed9 Add docker fonctonfig library for #2546 2015-12-24 19:54:12 +01:00
Aaron van Geffen 995799b843 Try Arial as a fallback font if a language's preferred font cannot be loaded. 2015-12-25 03:22:46 +09:00
Aaron van Geffen 474af5c204 Use Cocoa APIs for font detection on OS X. Moving FontConfig to Linux platform only. 2015-12-25 02:52:33 +09:00
IntelOrca 36581bd664 return an exit code in publish script 2015-12-24 17:22:12 +00:00
Aaron van Geffen 8bdec9f68e Experimental: use SHGetKnownFolderPath to get font path on Windows. 2015-12-25 02:17:45 +09:00
Michał Janiszewski 9b838aa0ee Add missing fontconfig lib for Travis and Docker 2015-12-25 01:53:53 +09:00
Aaron van Geffen dd604afc89 Use FontConfig to find suitable TrueType fonts on Linux and OS X. Fixes #2537. 2015-12-25 01:53:52 +09:00
Aaron van Geffen a0de23758e Specify font name on all TTF descriptors. 2015-12-25 01:53:52 +09:00
Ted John 7df3630ea2 Merge pull request #2548 from ecnepsnai/develop 
Automatically open shops & stalls
 2015-12-24 16:47:21 +00:00
Ian Spence 434b62436c Addresses code review comments 2015-12-24 08:44:12 -08:00
Ian Spence ba038c10ab Automatically open shops & stalls 
- Added a new option under misc to automatically open shops and stalls
 - Option is disabled by default
 - When enabled, shops & stalls are automatically opened right after being placed on the map
 2015-12-24 00:00:41 -08:00
Ted John 652031e0fe Merge Localisation/master into OpenRCT2/develop. 2015-12-24 04:00:18 +00:00
IntelOrca f93a134aa6 fix map size error when sending network game information 2015-12-24 01:40:03 +00:00
IntelOrca ce0f7ab426 fix #2536: Client crashes when building new Rides 2015-12-24 01:35:14 +00: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
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 5d66308e9d Merge pull request #2541 from AaronVanGeffen/subst_typo 
Corrected misspellings of "substitute"
 2015-12-22 16:23:46 +00:00
Aaron van Geffen 2c5651614c Corrected misspellings of "substitute". 2015-12-23 00:40:36 +09: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
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
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