Commit Graph

520 Commits

Author SHA1 Message Date
Glowbal
a13441fa85 Merge branch 'release'
Conflicts:
	addons/main/script_version.hpp
2016-10-25 20:33:25 +02:00
Glowbal
36085ebd9c Prep 3.8.1 release 2016-10-25 20:20:26 +02:00
Glowbal
d2f485329f Update make.py to 0.8 (#4579) 2016-10-25 20:11:57 +02:00
jonpas
ffd1f0aff2 Update make.py to 0.8 (#4579)
* Update make.py to 0.8

* Remove redundant extras folder obsolete handling

* Fix version updating in files when version changes number of digits

* Satisfy bux
2016-10-25 20:11:05 +02:00
Rory
07068260fe Wiki update (#4589)
* Wiki update
- Updated class-names.md entries for chemlights, incendiary grenade and spraypaint.
Added chemlights feature with usage info.
Added spraypaint feature with usage info.

* correct version of spray paint in class-names.md

* Correction
removed spraypaint.md since tagging.md was already present
updated chemlights with removal of 1.1 (adding throw possibilities)

* Reworked chemlights.md
removed usage => already referred to advanced grenades
Changed description

* removed tagging addition from class-names.md

* added |
2016-10-24 08:45:21 +02:00
PabstMirror
e5c59b56fb Update wiki version to 3.8 (#4570) 2016-10-19 15:52:46 -05:00
Glowbal
bf5892aa2a Merged branch release into master 2016-10-18 22:59:44 +02:00
bux578
846b7f26f7 Dockerfile (#4550)
* add init dockerfile

* add dockerfile documentation

* gitignore gemfile.lock

* improve Dockerfile

* add docker-compose file

* change readme to use docker-compose

* improve readme

* Fix readme - Debian != Windows

* Small wording improvement

* copy contents into dockerfile

To be able to run it without a volume (but with `docker-compose up` who
would do that :) )
2016-10-16 10:48:14 +02:00
bux578
99d910d6c9 fix spelling of ruby 2016-10-14 07:55:46 +02:00
bux578
4d31c8f148 add missing line in medical doc (#4545) 2016-10-11 21:42:16 -05:00
Glowbal
a98013c36e Merge branch 'master' into release 2016-10-11 18:51:05 +02:00
jonpas
cbbdd6f939 Use apt-get consitently instead of new apt only 2016-10-11 14:21:54 +02:00
jonpas
627a11545a Fix documentation README commands 2016-10-11 14:18:58 +02:00
jonpas
d29677d366 Remove Laser-SelfDesignate wiki page 2016-10-08 15:01:34 +02:00
Glowbal
8e72d89ef6 Prepare 3.80 RC1 2016-10-08 13:10:34 +02:00
ace3mod
c192378e90 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-10-08 12:56:30 +02:00
bux578
c57e2e1cd0 make wide tables scrollable on mobile 2016-10-03 07:02:50 +02:00
ace3mod
85a1ce6d83 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-28 13:16:04 +02:00
commy2
1219d3df23 remove deprecated sitting module (#4458)
* remove deprecated sitting module

* Update sitting documentation for removal

* Remove ACE3 sitting doc, redirect to ACEX and add note

* Fix wording
2016-09-28 13:14:50 +02:00
ace3mod
565af1b571 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-26 19:10:36 +02:00
jonpas
33ab8c18ff Add version note to yellow Advanced Throwing circle documentation 2016-09-23 20:21:24 +02:00
PabstMirror
b7dfdc6c84 End path drawing when passing through Geom/Fire (#4385)
* End path drawing when passing through Geom/Fire

* Add Advanced Throwing colored circles documentation
2016-09-23 12:48:15 -05:00
BaerMitUmlaut
ac2a71e376 Fix grenade docs base url 2016-09-20 14:28:11 +02:00
BaerMitUmlaut
e8249f8991 Merge pull request #4442 from acemod/add-throwing-hint
Add hint to grenades pages for advanced throwing
2016-09-19 21:41:08 +02:00
BaerMitUmlaut
93139c86f7 Added hint to grenades pages for advanced throwing 2016-09-19 21:38:41 +02:00
BaerMitUmlaut
ddb449cdbb Merge pull request #4401 from acemod/advanced-fatigue-doc
Advanced Fatigue documentation
2016-09-19 21:18:58 +02:00
BaerMitUmlaut
ed91aec84b Fixed usage of aerobic instead of anaerobic 2016-09-19 20:37:43 +02:00
ace3mod
0532249430 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-19 17:42:34 +02:00
commy2
3d422021ef Merge pull request #4377 from acemod/sys-blood-port
Add ace2 sys blood port
2016-09-19 17:35:32 +02:00
Grzegorz
9877a58466 typo
This will fix typo on the wiki.
2016-09-18 18:50:33 +02:00
ace3mod
48a572573e [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-18 15:22:39 +02:00
ace3mod
543819c5f5 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-18 15:10:11 +02:00
commy2
95409f6772 Merge pull request #4383 from acemod/support-disable-cookoff
Add object attribute to disable cookoff for individual vehicles
2016-09-17 18:50:34 +02:00
Glowbal
01a586e9c2 Also fix release url display 2016-09-17 17:45:30 +02:00
Glowbal
24142f6879 Fix release url 2016-09-17 17:45:06 +02:00
Glowbal
1bd30c4b85 Add ace_blood documentation 2016-09-17 16:54:21 +02:00
bux578
3da236def8 Update 2016-09-17-ace3-version370.md 2016-09-17 12:22:17 +02:00
bux578
6fe31e6be6 Rename 2016-09-12-ace3-version370.md to 2016-09-17-ace3-version370.md 2016-09-17 12:16:51 +02:00
bux578
1ea99c6ab1 Merge pull request #4384 from acemod/acerep-6
ACEREP 00006
2016-09-17 12:15:52 +02:00
Glowbal
5134c16dd0 Add cookoff documentation 2016-09-17 12:15:08 +02:00
ace3mod
b8948ec296 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-17 11:41:48 +02:00
Glowbal
1d637476c9 ACEREP #00006 2016-09-17 11:27:52 +02:00
jonpas
e59727d322 Remove dependencies list prefix 2016-09-16 03:34:54 +02:00
jonpas
2ca67e16a8 Fix dependencies list prefix - there shan't be one! 2016-09-16 03:33:20 +02:00
BaerMitUmlaut
afd1ae0879 Added note regarding basic medical 2016-09-15 22:47:21 +02:00
BaerMitUmlaut
bbce8e397e Added medical AI documentation 2016-09-15 14:08:03 +02:00
BaerMitUmlaut
207944a3a2 Fix pabst 2016-09-15 12:51:18 +02:00
PabstMirror
200d620d11 spellfix2 2016-09-14 22:18:42 -05:00
PabstMirror
a93aad10a0 Fix speeling 2016-09-14 20:00:18 -05:00
BaerMitUmlaut
15bed8e122 Added advanced fatigue documentation 2016-09-15 02:25:32 +02:00
jonpas
471cc2fdb5 Escape jekyll code in documentation guidelines page 2016-09-14 21:30:43 +02:00
ace3mod
39ffdff920 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-13 21:56:07 +02:00
ace3mod
3280dba5be Revert "[Docs] Update component dependencies"
This reverts commit a5577b27f6.
[ci skip]
2016-09-13 21:35:29 +02:00
ace3mod
a5577b27f6 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-13 21:31:51 +02:00
Glowbal
4c8466a790 Set release version 2016-09-13 21:28:34 +02:00
Glowbal
65cdf200fb Merged branch release into master 2016-09-13 21:28:22 +02:00
Josuan Albin
a9b82513f7 Medical doc update (#4359) 2016-09-09 10:50:52 +02:00
jonpas
65df821e2b Add wiki ACEX sections and merge Mission Makers and Framework sections (#4307)
* Update documentation guidelines

* Add version info part 1

* Add version info part 2

* Add removed in version to frontmatter and tag testmissions as removed

* Add version info part 3

* Seaparate ACE3 and ACEX Features/Framework menus, Add ACEX Headless documentation

* Add ACEX support to extract_dependencies.py

* Merge useful-functions into frameworks

* Move class-names to main menu

* Prettify class-names table titles

* Fix table of contents on documentation guidelines and tips

* Merge mission-tools into frameworks

* Merge modules into frameworks

* Rename to Frameworks (plural)

* Fix capitalization in class-names

* Improve wiki menu positioning

* Add 'mod' to documentation guidelines

* Update frameworks sections description for new content

* Update wiki menu descriptions

* Fix class-names 4 digit versions

* More places for descriptions

* Include documentation in PRs if applicable note

* Add short ACE3 and ACEX description page, outlining the difference
2016-09-08 21:19:07 +02:00
jonpas
7695c660cb Remove voting text in Arma 3 Issues list 2016-09-07 01:54:13 +02:00
Glowbal
9cd50c89a0 Add particles issue to issues list 2016-09-05 20:49:32 +02:00
jonpas
55eb252308 Fix documentation development environment guide 2016-09-05 00:37:58 +02:00
Glowbal
849a2cd475 Prepare 3.7.0 2016-09-04 21:51:36 +02:00
ace3mod
ad7c5657c5 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-04 21:34:15 +02:00
ace3mod
60b780e02b [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-04 11:26:25 +02:00
ace3mod
0a6bfd987c [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-04 11:09:44 +02:00
ace3mod
9c0b7c6d16 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-03 01:41:02 +02:00
jonpas
0e1f2828a9 Rename Advanced Throwing component to be in-line with other advanced_ components (#4318)
* Rename Advanced Throwing component to be in-line with other advanced_ components

* Rename wiki page as well

* Add redirect from old wiki page
2016-09-03 01:39:34 +02:00
jonpas
1df3a73461 Add version information to most wiki feature and framework pages (#4303)
* Update documentation guidelines

* Add version info part 1

* Add version info part 2

* Add removed in version to frontmatter and tag testmissions as removed

* Add version info part 3
2016-08-30 15:49:04 +02:00
bux578
45c0a56023 Add proper headline for gun bag, fix #4312 2016-08-30 11:43:21 +02:00
jonpas
96195689cd Merge pull request #4299 from acemod/fixBIissuesLinks
Fix Arma 3 issues links
2016-08-27 18:09:06 +02:00
jonpas
08d2bf706b Add DeRap to required Mikero's Tools 2016-08-27 18:04:50 +02:00
jonpas
fc7d6b50f6 Add Tagging documentation (new location) (#4260)
* Add Tagging documentation (new location)

* Add version information
2016-08-27 15:19:14 +02:00
jonpas
9053f18ce4 Fix Arma 3 issues links 2016-08-27 14:59:00 +02:00
PabstMirror
df7aa38a7a Allow inheritance for addActionToClass (#4272)
* Allow inheritance for addActionToClass

* Update Headers

* Use inline code for inheritance example
2016-08-27 10:35:21 +02:00
Glowbal
34b86869d9 Merge pull request #4291 from acemod/versionDocs
add version to frontmatter and display it in the wiki
2016-08-27 10:23:52 +02:00
ace3mod
ac0c429a28 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-08-27 10:21:02 +02:00
PabstMirror
613ea7c4ec Wiki - Add link from missionmaker to framework for interaction menu 2016-08-26 12:55:49 -05:00
Glowbal
ee307c405b Add note about no settings class for serverconfig 2016-08-24 19:48:26 +02:00
bux578
244c3b8056 add version to frontmatter and display it in the wiki 2016-08-24 16:36:21 +02:00
ace3mod
aaa6b75302 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-08-22 15:10:27 +02:00
jonpas
f8dfa4f933 Add Advanced Throwing (#3477)
* Add Advanced Throwing

* Add feature documentation
2016-08-22 15:09:08 +02:00
bux578
9a0d569c56 Merge pull request #4262 from acemod/jekyllReadme
Update documentation development environment instructions
2016-08-21 06:36:43 +02:00
ace3mod
bceb94c493 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-08-21 00:26:28 +02:00
jonpas
d1d23c55bc Streamline dependencies extraction tool (#4268)
* Streamline dependencies extraction tool for new wiki location, Update dependencies list

* Use LF strictly
2016-08-19 15:58:39 +02:00
jonpas
9599ab9bd9 Streamline closing points on wiki pages (#4269) 2016-08-19 15:47:03 +02:00
jonpas
9415d0fb03 Fix Events Framework documentation 3.1 section (#4266)
* Fix 3.1. section, Add dots after numbers, Update CBA doc with target _blank

* Fix closing points
2016-08-19 15:44:30 +02:00
bux578
4f3ff2c967 fixes 2016-08-19 15:20:22 +02:00
jonpas
3884821eb1 Fix list in interaction menu framework documentation 2016-08-19 00:57:19 +02:00
jonpas
58bf3c4719 Remove never-merged rearm feature and framework documentation 2016-08-18 21:01:44 +02:00
jonpas
b22a4bee60 Update documentation development environment instructions 2016-08-18 20:45:39 +02:00
bux578
468662b46e Create CNAME 2016-08-18 19:00:17 +02:00
bux578
accd408418 merge gh-pages content into docs folder
https://github.com/blog/2228-simpler-github-pages-publishing
2016-08-18 18:37:38 +02:00
Glowbal
2f2c4b91a1 3.6.2 2016-07-14 14:51:46 +02:00
Glowbal
9b85bc3e29 v3.6.1 2016-07-11 11:15:36 +02:00
Glowbal
eef2bb060a Update readme version mentions 2016-06-21 18:09:15 +02:00
Glowbal
485900dce8 increment patch version 2016-03-16 22:59:28 +01:00
jonpas
a928185ea0 Remove download badge 2016-03-03 17:09:37 +01:00
Glowbal
428b828c27 Increase version 3.5.0 2016-02-27 20:44:38 +01:00
looterz
4999f30e0b Updated README's to reflect #3278 2016-02-18 16:39:23 -06:00
licht-im-Norden87
34d9b7d4ea Update README_DE.md 2016-02-10 04:26:21 +01:00
licht-im-Norden87
999a6cd29d Update README_DE.md 2015-12-14 16:58:00 +01:00
licht-im-Norden87
a3e1e124f2 Update README_DE.md 2015-12-14 16:56:47 +01:00
licht-im-Norden87
9c28ea5004 Readme_DE.md, small grammar fix 2015-10-19 17:21:54 +02:00
Felix Wiegand
ece11c335d Merge pull request #2756 from acemod/flat-badges
Use "flat-square" badge style
2015-10-19 09:45:31 +02:00
KoffeinFlummi
c5fd41b9a1 Add flat badges to other READMEs 2015-10-19 09:44:40 +02:00
bux578
a873481c36 improve german readme 2015-10-19 07:37:14 +02:00
bux578
94b90fe0b4 Merge branch 'patch-12' of git://github.com/licht-im-Norden87/ACE3 into licht-im-Norden87-patch-12 2015-10-19 07:30:59 +02:00
jonpas
36895d2e30 Update more version numbers 2015-10-09 00:23:36 +02:00
jonpas
e5a7516ec1 Non-English as well 2015-10-08 23:54:44 +02:00
jonpas
7c101bde87 Change build badge tooltip 2015-10-08 21:01:06 +02:00
jonpas
7efcc3b8d1 Update version and download size 2015-10-08 20:33:20 +02:00
jonpas
4b7f281eba Fix slacking badge links, Add Travis CI build badge 2015-10-08 20:30:54 +02:00
licht-im-Norden87
8cbd573093 Update README_DE.md 2015-10-08 19:20:17 +02:00
licht-im-Norden87
e056a3b2cd Update README_DE.md 2015-10-03 04:54:10 +02:00
licht-im-Norden87
411ddac3b9 Update README_DE.md 2015-10-03 04:53:00 +02:00
licht-im-Norden87
2afbe36b89 Update README_DE.md 2015-10-03 04:39:22 +02:00
licht-im-Norden87
978d002112 Update README_DE.md 2015-10-03 04:37:28 +02:00
licht-im-Norden87
4d867cb4f7 Update README_DE.md 2015-10-03 04:36:38 +02:00
jonpas
6f3ed6488e Added Slackin to DE and PL readmes 2015-09-09 18:56:02 +02:00
bux578
6da19a43df remove documentation from master 2015-09-07 19:50:38 +02:00