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

6572 Commits

Author SHA1 Message Date
OpenRCT2 git bot b23c27c6e9 Merge Localisation/master into OpenRCT2/develop. 2016-01-29 04:00:13 +00:00
Ted John 9fdc5639e8 Merge pull request #2833 from marijnvdwerf/fix-2828 
Fix maze placement
 2016-01-28 22:06:22 +00:00
Marijn van der Werf 8f8d0e2473 Fixes #2828: shifting by wrong number of bits 2016-01-28 21:40:06 +01:00
OpenRCT2 git bot 7a6cdbcfed Merge Localisation/master into OpenRCT2/develop. 2016-01-28 04:00:13 +00:00
Ted John 1bf543f606 Merge pull request #2815 from LRFLEW/develop 
Fix unsigned warning in network_set_player_last_action_coord
 2016-01-27 23:13:32 +00:00
LRFLEW 095e0e18e3 Fix unsigned warning in network_set_player_last_action_coord 2016-01-27 16:00:00 -07:00
duncanspumpkin e7545983f1 Fix #2825. Issue caused by incorrect signness of variable 2016-01-27 17:47:10 +00:00
Ted John 6ee91c7fe9 Merge pull request #2823 from janisozaur/libpng 
Fix for libpng
 2016-01-27 08:27:53 +00:00
Ted John 9a8460fe02 Merge pull request #2824 from LRFLEW/futravis 
Fixed travis OS X failure and removed using 10.10 SDK
 2016-01-27 08:25:40 +00:00
LRFLEW 5f2822f4a7 Fixed travis OS X failure and removed using 10.10 SDK 2016-01-27 00:53:33 -07:00
Michał Janiszewski 184dbe21c6 Fix for libpng 2016-01-27 07:54:28 +01:00
OpenRCT2 git bot cc40a8292c Merge Localisation/master into OpenRCT2/develop. 2016-01-27 04:00:12 +00:00
Ted John dff4a693e7 Merge pull request #2819 from janisozaur/headless 
Don't update title screen when running headlessly
 2016-01-26 10:48:18 +00:00
Michał Janiszewski fc6b472ba9 Don't update title screen when running headlessly 2016-01-26 11:26:32 +01:00
Ted John 6cb0a6bfbc Merge pull request #2818 from JarnoVgr/websitemerge 
Readme update: Download details
 2016-01-26 09:49:42 +00:00
Jarno Veuger c68ec75969 Download details update 
- Removed UrsaLabs build link since they're outdated.
- OpenRCT2.com and OpenRCT.net merged to OpenRCT2.org
 2016-01-26 10:35:35 +01:00
OpenRCT2 git bot c79541a3a7 Merge Localisation/master into OpenRCT2/develop. 2016-01-26 04:00:13 +00:00
Ted John e01da33fce Merge pull request #2812 from janisozaur/disable-cheats-mp 
Disable opening cheats window in MP
 2016-01-25 20:50:21 +00:00
Michał Janiszewski ec2387082c Remove cheats from config 2016-01-25 21:44:13 +01:00
Michał Janiszewski dd37ca05c3 Disable opening cheats window in MP 
When connecting to a server, also reset cheats.

This should fix #2811
 2016-01-25 21:44:09 +01:00
Ted John 6a3d199944 Merge pull request #2770 from pizza2004/develop 
Add New Game Option to the File Menu
 2016-01-25 20:33:19 +00:00
Ted John 312825c39c Merge pull request #2809 from LRFLEW/ini 
Fixed minor issues with handling whitespace in config.ini
 2016-01-25 20:30:01 +00:00
Chad Anderson bc92446d32 New Game Option 
I added a menu option to bring up the Scenario Selector from within
game, so that you can easily choose a new level without needing to load
the Title Screen.
 2016-01-25 13:15:26 -07:00
LRFLEW 7c0b1e288c Fixed minor issues with handling whitespace in config.ini 2016-01-25 13:10:36 -07:00
duncanspumpkin c879c1697e Fix #2110. Boat hire mode no longer causes a crash with incorrect vehicle type 
This fixes the crash but you can't at present set the number of cars to 1 so its still not completely possible to do what @webhawk wanted
 2016-01-25 18:20:46 +00:00
IntelOrca e3f0d22988 invalidate dropdown when highlighted index is set to default 2016-01-25 18:12:13 +00:00
Ted John cbd5afde53 Merge pull request #2813 from duncanspumpkin/fix_dropdown 
Fix dropdown default highlight regression
 2016-01-25 18:09:23 +00:00
duncanspumpkin ba314c6fc8 Fix dropdown default highlight regression 2016-01-25 17:11:56 +00:00
Ted John 0e96c259b9 Merge pull request #2807 from LRFLEW/disabled 
Improved Rendering of Disabled Scenario Names
 2016-01-25 13:13:37 +00:00
Ted John 38df0fed3e Merge pull request #2808 from zsilencer/multiplayer 
fix some issues with multiplayer
 2016-01-25 13:12:54 +00:00
Ted John 47e6d6a772 Merge pull request #2810 from janisozaur/packaging 
Packaging
 2016-01-25 13:09:51 +00:00
Michał Janiszewski b7820c09cd Add docs to CPack-generated packages 
Includes licence, contributors, readme, etc.
 2016-01-25 11:17:25 +01:00
Michał Janiszewski d076868f5a Make Travis-CI create better standalone packages 
While CPack, the component used for handling installation of files into
proper places, works fine for `install` make target, it does somewhat
poor job when it comes to generating stand-alone packages.

List of offending items include:
* Improper tar archive structure (directory entries missing)
* Package layout not suitable for running stand-alone
* Top level directory name keeps changing which hinders upcoming
  installer

Thic commit takes care of these problems by generating the package using
`make install` and then shuffling files around manually.

This also changes the hash blurb to be 7 characters instead of 8, to be
more compatible with git defaults.
 2016-01-25 11:17:25 +01:00
zsilencer d315e9e075 fix bug caused by using id as index 2016-01-24 21:02:15 -07:00
zsilencer 32f1aa064d more accurate last player action location 2016-01-24 21:00:31 -07:00
OpenRCT2 git bot 233e3ff058 Merge Localisation/master into OpenRCT2/develop. 2016-01-25 04:00:13 +00:00
zsilencer 74225ad4bc fix issue with group name string ids after loading new map 2016-01-24 18:33:28 -07:00
LRFLEW a842e3a650 Improved Rendering of Disabled Scenario Names 2016-01-24 17:06:05 -07:00
Ted John 4ff3c11366 Merge pull request #2806 from janisozaur/fixes2 
Fix zlib inflate on broken builders
 2016-01-24 20:50:25 +00:00
Michał Janiszewski b89282cc2f Fix zlib inflate on broken builders 2016-01-24 21:36:14 +01:00
Ted John 783921c9ff Merge pull request #2804 from janisozaur/fixes 
Fallback to non-compressed sv6 on broken builders
 2016-01-24 20:05:13 +00:00
Michał Janiszewski 2439ba5b9c Fallback to non-compressed sv6 on broken builders 2016-01-24 21:01:31 +01:00
Ted John 6e22877ced Merge pull request #2803 from janisozaur/fixes 
Game commands' argument validation
 2016-01-24 19:37:20 +00:00
Michał Janiszewski 95e3895b89 Game commands' argument validation 2016-01-24 19:31:40 +01:00
Ted John 80550ca365 Merge pull request #2752 from Broxzier/fix_money_invalidation 
Fix #2750 invalidate top toolbar when toggling the use of money.
 2016-01-24 16:10:50 +00:00
IntelOrca 0360a808c3 fix shortcut reading and defaults 2016-01-24 16:09:45 +00:00
Ted John d0a95bc7b7 Merge pull request #2796 from AaronVanGeffen/shortcut_options 
Allow assigning a shortcut to the options window
 2016-01-24 15:52:15 +00:00
Aaron van Geffen 2d90bc8354 Allow assigning a shortcut to the options window. 2016-01-25 00:45:24 +09:00
Ted John 6eaa93c9bc Merge pull request #2783 from zsilencer/multiplayer 
MP groups and permissions
 2016-01-24 12:29:27 +00:00
duncanspumpkin 7cf156a86a Fix #2771. Observation towers now spin correctly. 
Issue was caused by mistyping the variable name
 2016-01-24 08:15:10 +00:00