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

6317 Commits

Author SHA1 Message Date
Duncan f15d8bc5e4 Merge pull request #2937 from janisozaur/fixes 
Fixes
 2016-02-14 22:05:05 +00:00
Michał Janiszewski a09afd0be5 Minor fixes 
* Be more cautious while doing pathfinding
* Be a little more deterministic on network by initialising all member
  fields.
 2016-02-14 22:22:38 +01:00
Michał Janiszewski 2ebb691e71 minor fixes 
* initialize variables properly
* fixes to handling of zenity/kdialog on Linux
* remove unnecessary call
 2016-02-14 21:06:44 +01:00
duncanspumpkin cd2d14fcec Reload vehicleEntry on change in car to fix special trains. 
You can have different flags set for different train cars
 2016-02-14 19:52:35 +00:00
Ted John b11fbe9ab1 Merge pull request #2936 from janisozaur/ride-subtype 
Don't crash when dealing with a hacked ride subtype
 2016-02-14 18:06:18 +00:00
Michał Janiszewski 2cce13da1b Don't crash when dealing with a hacked ride subtype 2016-02-14 18:47:57 +01:00
IntelOrca 8268f607cd implement track_remove_station_element 2016-02-14 17:37:28 +00:00
IntelOrca c137ac41c0 implement track_add_station_element 2016-02-14 15:29:53 +00:00
duncanspumpkin 843b588b15 Remove redundant callproc code / comments. 2016-02-14 09:34:30 +00:00
Duncan 0cbc8d9372 Merge pull request #2903 from OpenRCT2/peep 
Staff Path Finding
 2016-02-14 09:29:55 +00:00
Duncan 58d0cc9e79 Merge pull request #2929 from Wirlie/patch-1 
One issue fixed with Ferris Wheel
 2016-02-14 07:20:15 +00:00
Duncan 0e75efc1eb Merge pull request #2927 from OpenRCT2/clear_funcs 
Implement Clear funcs
 2016-02-14 07:19:33 +00:00
OpenRCT2 git bot ab04ece601 Merge Localisation/master into OpenRCT2/develop. 2016-02-14 04:00:17 +00:00
Wirlie 4e3261decb One issue fixed with Ferris Wheel 2016-02-13 20:29:41 -06:00
Ted John fc8197b194 Merge pull request #2928 from LRFLEW/backslash 
Use Double-Backslash Escaping in Config.ini
 2016-02-14 00:50:27 +00:00
LRFLEW aab0ad1779 Use Double-Backslash Escaping 2016-02-13 17:29:58 -07:00
duncanspumpkin 53689349f9 Fix mistake added in refactor. 
Also remove redundant global variable setting
 2016-02-13 21:55:00 +00:00
Duncan 7670d13416 Merge pull request #2926 from Wirlie/patch-1 
Fixes #2921 'Guests can't stop going to ride if queue is full.'
 2016-02-13 21:11:59 +00:00
duncanspumpkin 9c3055224d Refactor clear funcs 2016-02-13 21:01:36 +00:00
duncanspumpkin 305ae76346 Implement clear funcs for remaining functions 2016-02-13 20:26:22 +00:00
Josue Acevedo f1e4cfd34b Fixes #2921 
Fixes #2921 'Guests can't stop going to ride if queue is full.'
 2016-02-13 14:18:00 -06:00
Ted John 45a5af5610 Merge pull request #2923 from OpenRCT2/test-sign-push 
Sign and push AppVeyor builds to OpenRCT2.org
 2016-02-13 19:34:54 +00:00
IntelOrca c9a532a180 don't decrypt sign key for PRs 2016-02-13 19:14:06 +00:00
duncanspumpkin dec8a980a0 Fix mechanics walking past entrances 2016-02-13 14:13:40 +00:00
duncanspumpkin e06915d4cd Implement entertainer pathfinding 2016-02-13 14:13:39 +00:00
duncanspumpkin 85af786b7f Implement security path finding 2016-02-13 14:13:39 +00:00
duncanspumpkin 0ee75aa7bf Finish mechanic pathfinding 2016-02-13 14:13:38 +00:00
duncanspumpkin ae4824cf74 Implement a tiny bit more 2016-02-13 14:13:37 +00:00
duncanspumpkin b2e29826c3 Implement start of mechanic path finding 2016-02-13 14:13:37 +00:00
duncanspumpkin f028c2c654 Finish implementing handyman path finding 2016-02-13 14:13:36 +00:00
duncanspumpkin 0ce5d7aa5c Implement direction to uncut grass 2016-02-13 14:13:36 +00:00
duncanspumpkin a4727499c2 Fix compiliation 2016-02-13 14:13:35 +00:00
Duncan 2276bfff33 Implement final part of handyman litter locating 
Split function up to make it easier to read.
Fixed a syntax issue.
 2016-02-13 14:13:35 +00:00
Duncan b2f756ef89 Implement more of handyman litter finding code. 2016-02-13 14:13:34 +00:00
Duncan 9648b4f82a Added finding nearby litter 2016-02-13 14:13:33 +00:00
duncanspumpkin 667d38754f Start implementing handyman pathfinding 2016-02-13 14:13:33 +00:00
Duncan c29a02605d Merge pull request #2880 from marijnvdwerf/peep-update-fixing 
[WIP] Decompile Peep update fixing
 2016-02-13 14:12:10 +00:00
Marijn van der Werf 3f7044c09c Decrease destination offset 2016-02-13 15:07:57 +01:00
Marijn van der Werf 5ab655cffc Use enum for track types 2016-02-13 14:54:27 +01:00
duncanspumpkin f6797181b5 Start implementing clear_funcs 2016-02-13 13:10:55 +00:00
Ted John 703e9c3153 Merge pull request #2839 from anyc/develop 
Linux: use zenity or kdialog to show user dialogs
 2016-02-13 12:15:41 +00:00
Jarno Veuger 95b5140fb1 Skip upgrade/downgrade process in installer for now 2016-02-13 12:12:22 +00:00
IntelOrca 7e0d49ecc6 replace build number with branch, commit or tag 2016-02-13 12:12:22 +00:00
IntelOrca 818ff719c2 add pushing of builds to OpenRCT2.org 2016-02-13 12:12:21 +00:00
IntelOrca c9042c6174 add code signing to AppVeyor CI 2016-02-13 12:12:20 +00:00
duncanspumpkin 564a26d006 Invalidate maintenance tab after fixing ride 2016-02-13 12:59:19 +01:00
IntelOrca ca115bb410 Merge branch 'scenario-select-callback' into develop 2016-02-13 11:43:11 +00:00
Chad Anderson 4658e80deb allow starting server with new scenario 2016-02-13 11:42:51 +00:00
IntelOrca 934bf28cc1 change scenario select to callback mechanism 2016-02-13 11:32:34 +00:00
Ted John 6d384fa2e5 Merge pull request #2911 from Overv/show-peeps-in-closed-ride 
Show amount of peeps still on ride in tooltip when ride is closed (resolves #2708)
 2016-02-13 11:19:40 +00:00