bux578
493613e1ed
Merge branch 'master' into acerep7
2016-11-03 10:26:41 +01:00
bux578
4ef3d9f063
improve dockerfile
2016-11-02 11:49:16 +01:00
bux578
7d3d3ad47d
add first draft of acerep
2016-11-02 11:46:50 +01:00
jonpas
9e37dc1192
Fix make.py wiki lists
2016-11-01 13:50:00 +01:00
PabstMirror
6a7998d47d
WebDoc Version to 3.8.1 ( #4611 )
...
Close #4610
2016-10-29 08:28:24 +02:00
ace3mod
d44770a27e
[Docs] Update component dependencies
...
Automatically committed through Travis CI.
[ci skip]
2016-10-27 19:35:23 +02:00
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