Merge remote-tracking branch 'refs/remotes/origin/master' into Dev

This commit is contained in:
Bjanski 2016-04-29 11:27:01 +02:00
commit 51b1d09cd8
2 changed files with 15 additions and 9 deletions

View File

@ -3,12 +3,17 @@ Exile Addons - originally small projects developed for the Arma Exile communitie
I'll gradually add all features I built, encouragements always helps the project to stay alive a little longer :smirk: | [Donate here](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=jan%2ebabor%2e383%40gmail%2ecom&lc=GB&item_name=ExAd&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted) I'll gradually add all features I built, encouragements always helps the project to stay alive a little longer :smirk: | [Donate here](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=jan%2ebabor%2e383%40gmail%2ecom&lc=GB&item_name=ExAd&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted)
## Installation & Examples
Instructions for installation is found under [docs](https://github.com/Bjanski/ExAd/tree/master/docs).
Each plugin must be installed seperately, I've done it this way to make the update procedure easier.
Below you can see what dependencies each plugin has.
##Collection ##Collection
* [Core](https://github.com/Bjanski/ExAd/tree/Core) * Core
* Virtual Garage .. *Coming Soon* * Virtual Garage
* Admin Events .. *Coming Soon* * Admin Events .. *Coming Soon*
* Hacking .. *Coming Soon* * Hacking .. *Coming Soon*
* Grinding * Grinding .. *Coming Soon*
* Halo & Parachute * Halo & Parachute
##Dependencies ##Dependencies
@ -28,7 +33,7 @@ I'll gradually add all features I built, encouragements always helps the project
##Contribute ##Contribute
Contributions are allways welcome, please read [Contribution Guidlines](CONTRIBUTING.md) first. Contributions are allways welcome, please read [Contribution Guidlines](CONTRIBUTING.md) first.
All contributed code first needs to be rewieved before pushed to master. All contributed code first needs to be rewieved and tested before pushed to master.
##License ##License
Apache License Apache License

View File

@ -1,11 +1,12 @@
# Installation # Installation
* Remember for this plugin to work you first need to install [Core](https://github.com/Bjanski/ExAd/blob/Core/docs/core/installation.md) * Remember for this plugin to work you first need to install [Core](https://github.com/Bjanski/ExAd/blob/master/docs/core/installation.md)
## Client ## Client
1. Place the folder "HaloParachute" into "mpmissions\exile.<MAP>\ExAd\" * Place the folder "HaloParachute" into "mpmissions\exile.<MAP>\ExAd\"
2. Goto "mpmissions\exile.<MAP>\ExAd\CfgFunctions" and uncomment * Goto "mpmissions\exile.<MAP>\ExAd\CfgFunctions" and uncomment
From From
```cpp ```cpp
//#include "HaloParachute\CfgFunctions.cpp" //#include "HaloParachute\CfgFunctions.cpp"
@ -15,8 +16,8 @@ To
#include "HaloParachute\CfgFunctions.cpp" #include "HaloParachute\CfgFunctions.cpp"
``` ```
3. Now you can go into "mpmissions\exile.<MAP>\ExAd\HaloParachute\customize.sqf" and change to desirable settings. * Now you can go into "mpmissions\exile.<MAP>\ExAdClient\HaloParachute\customize.sqf" and change to desirable settings.
## Server ## Server
No installation needed. No installation needed.