mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 08:12:53 +01:00
Code Issues Releases Wiki Activity
6,098 Commits 8 Branches 58 Tags
c879c1697e2bc10749ff01faa7e33eca3a7ae0c0
Commit Graph

6098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
duncanspumpkin
b39a48a792 Fix cable lift data logging 2016-01-24 08:04:13 +00:00
zsilencer
5aec23e2b0 forgot to include default group in grouplist packet 2016-01-23 18:57:56 -07:00
zsilencer
0e00c1e3ce load and save groups 2016-01-23 18:05:53 -07:00
zsilencer
8c608b6f6c fix issues with a few game commands 2016-01-23 17:33:08 -07:00
Ted John
b5f9fa4bc4 Merge pull request #2801 from LRFLEW/osx-focus 
Regain window focus on OS X file dialog close
 2016-01-24 00:30:52 +00:00
LRFLEW
44dd98135d Regain window focus on OS X file dialog close 2016-01-23 17:25:32 -07:00
Ted John
e316fa60b2 Merge pull request #2800 from LRFLEW/espanol 
Allow mixed language configuration in Xcode project
 2016-01-24 00:06:32 +00:00
zsilencer
85d77bb838 show last action in player window 2016-01-23 16:46:52 -07:00
LRFLEW
6576878540 Allow mixed language configuration in Xcode project 2016-01-23 16:36:55 -07:00
zsilencer
845c7ad067 disallow peep pickup if group does not have permission 2016-01-23 16:36:16 -07:00
IntelOrca
eb29b14681 Merge branch 'Giantaxe-develop' into develop 2016-01-23 21:54:20 +00:00
robin clemens
6db4536da9 1. Added --password=<str> to headless server mode to configure a password. 
2. added default_password under [network] to configure a default password for headless server mode
 2016-01-23 21:53:02 +00:00
zsilencer
5a72cb02f1 fix small issue caused by some RCT2_ADDRESS_COMMAND_MAP being used as 32 bit vars 2016-01-23 14:42:36 -07:00
zsilencer
db90477cae add locate player's most recent action button 2016-01-23 14:16:26 -07:00
zsilencer
5a43e313b5 add can't kick host error 2016-01-23 13:29:17 -07:00
zsilencer
5f7c81083e add separate Clear Landscape action and fix a bug 2016-01-23 13:19:17 -07:00
zsilencer
de1fa24e7b add last player action to player list 2016-01-23 12:32:02 -07:00
Ted John
75b9e4a653 Merge pull request #2793 from OpenRCT2/implement-ride-create-vehicles 
Implement ride create vehicles
 2016-01-23 19:13:09 +00:00
IntelOrca
4c1605f268 refactor and format old C++ code 2016-01-23 18:58:31 +00:00
duncanspumpkin
a79a6969eb Fixed miss centered vehicles. Fixed incorrect starting track progress. Fix newlines. 2016-01-23 18:50:36 +00:00
zsilencer
ef4fc84634 consolidate actions list 2016-01-23 11:34:05 -07:00
Ted John
36a4cd2fa0 Merge pull request #2798 from janisozaur/lodepng-cleanup 
Cleanup unused lodepng stuff
 2016-01-23 16:49:12 +00:00
Michał Janiszewski
8599468760 Cleanup unused lodepng stuff 2016-01-23 17:13:15 +01:00
Ted John
d621fafb3e Merge pull request #2795 from AaronVanGeffen/invalidate_ride_window 
Repopulate ride list when invalidating the ride construction window
 2016-01-23 14:51:48 +00:00