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

5633 Commits

Author SHA1 Message Date
IntelOrca 2dfc43b8e8 close #2382: Don't suppress drown messages in Six Flags scenarios 2015-12-26 17:34:14 +00:00
IntelOrca 574774b2af add notification conditions 2015-12-26 17:33:33 +00:00
IntelOrca cd99b87de6 add UI for notification settings 2015-12-26 17:30:13 +00:00
IntelOrca 3b5768f5bc print '(debug)' to version string when build in debug configuration 2015-12-26 17:23:27 +00:00
IntelOrca 6240f063f1 fix a couple of sprite ID definitions 2015-12-26 17:19:25 +00:00
IntelOrca 4eb8192549 replace tutorial button with new multiplayer button 
tutorial button and multiplayer button can be enabled / disabled easily, window auto resizes etc.
 2015-12-26 17:09:37 +00:00
Ted John 42292ea218 Merge pull request #2560 from HaasJona/stings 
New StringIds and condition fix.
 2015-12-26 16:40:09 +00:00
Jonathan Haas 2ed4802032 Fix and replace some StringIDs 
Create some additional named StringIDs.
Fix a broken condition for tracked peep notifications, as the in/on ride messages were reversed.
 2015-12-26 14:50:03 +01:00
Michał Janiszewski 53970c2d77 Add tile type for corrupt element 
Fixes #2558
 2015-12-26 13:36:32 +01:00
Michał Janiszewski 79e5bb758d Add an assert for getting proper mapElementType 2015-12-26 13:16:03 +01:00
Ted John de52321026 Merge pull request #2557 from janisozaur/max-path 
Use MAX_PATH define for path length, remove redefinition
 2015-12-26 10:54:19 +00:00
Ted John 34ab8c0d62 Merge pull request #2546 from AaronVanGeffen/fontdirs 
Proper font support for Linux and OS X
 2015-12-26 10:48:47 +00:00
Ted John 164b44fa6a Merge pull request #2556 from AaronVanGeffen/minor_refactor 
Refactoring: replace several magic numbers with named equivalents
 2015-12-26 10:28:08 +00:00
Michał Janiszewski 6d5c96d083 Use MAX_PATH define for path length, remove redefinition 2015-12-26 11:18:44 +01:00
Aaron van Geffen 3d99b73ae1 Name enabled widgets on scenario select screen. 2015-12-26 18:46:19 +09:00
Aaron van Geffen 020334fa18 Name rct_window's var_494: highlighted_item. 2015-12-26 18:46:19 +09:00
Aaron van Geffen 9232a9906f Inventarised instances of RCT2_ADDRESS_COMMON_FORMAT_ARGS 2015-12-26 18:24:36 +09:00
Aaron van Geffen f44ee1ec04 Merge pull request #2 from janisozaur/fontconfig-memleak 
Fix memory leaks in font selection for Linux
 2015-12-26 15:05:14 +09:00
Ted John 799d377d90 Merge Localisation/master into OpenRCT2/develop. 2015-12-26 04:00:18 +00:00
Ted John 8ce98dc8c5 Merge pull request #2555 from JarnoVgr/distribution 
Publisher script improvements (installer)
 2015-12-25 23:46:04 +00:00
Michał Janiszewski c0830ae02e Fix memory leaks in font selection for Linux 
Add some logging too, in particular warning when no font was found.
 2015-12-25 20:32:54 +01:00
Aaron van Geffen eda733165e Added a hack for MINGW compatibility. 2015-12-26 01:00:34 +09:00
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