Commit Graph

10792 Commits

Author SHA1 Message Date
[OMCB]kaban
64cf8aa95a Russain Translations Update (#4286) 2016-08-27 10:36: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
1366a6f15f Merge pull request #4289 from acemod/earlyAddPlayerEventHandler
Fix null ace_player from early call to addPlayerEH
2016-08-27 10:32:12 +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
Grey-Soldierman
dae3d8d682 Definable classname for Spare Barrel (#4121)
* Added definable barrel classname through weapon config

* Improved condition for player carrying spare barrel
2016-08-27 10:21:15 +02:00
ace3mod
ac0c429a28 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-08-27 10:21:02 +02:00
voiperr
fedad7f8f7 Ace_Chemlights (Chemlight Enhancements) (#3921)
* Add ace_chemlights.
Make chemlight intensity and dropoff more realistic.
Add orange, white, IR chemlights.
Add chemlight shields.
Make chemlight impact sounds more realistic.

* Moved impact sound changes to a different branch.

* Used QPATHTOF. Fixed scopes. Used initServer. Reduced lifetime duration.
Checked privates.

* Stringtable: 5 minute.

* Blue lifetime. Removed ref to deprecated function

* Use proper magazine macro. Add new chemlights to Misc box.
2016-08-27 10:19:39 +02:00
commy2
9ef24d25ba paradrop crates from helicopter or plane cargo (#2468) 2016-08-27 10:14:54 +02:00
Glowbal
0bccaf698d Merge pull request #4295 from acemod/wiki-misisonmakerInteraction
Wiki - Add link from missionmaker to framework for interaction menu
2016-08-26 20:50:45 +02:00
PabstMirror
613ea7c4ec Wiki - Add link from missionmaker to framework for interaction menu 2016-08-26 12:55:49 -05:00
PabstMirror
c9f9b89ea2 Fix merge (was moved to XEH_postInitServer)
Use short circuit for loadout change and add note
2016-08-25 18:56:57 -05:00
PabstMirror
fd6bd7f794 Merge branch 'flashlight_housekeeping' of https://github.com/voiperr/ACE3 into voiperr-flashlight_housekeeping 2016-08-25 15:50:11 -05:00
bux578
120daf69ee Merge pull request #4292 from acemod/no-settings-class-serverconfig
Add note about no settings class for serverconfig
2016-08-25 08:27:44 +02:00
Glowbal
ee307c405b Add note about no settings class for serverconfig 2016-08-24 19:48:26 +02:00
Joko
927d8ead8f add Hiddenselection camo to bodybag for Retexturing (#4276)
* add Hiddenselection camo to bodybag

* Add default texture

* Use macro
2016-08-24 12:42:32 -05:00
bux578
244c3b8056 add version to frontmatter and display it in the wiki 2016-08-24 16:36:21 +02:00
PabstMirror
3f343086dc ad fix for noradio 2016-08-23 22:43:37 -05:00
PabstMirror
18153b0451 Fix null ace_player from early call to addPlayerEH 2016-08-23 22:24:59 -05:00
PabstMirror
5a83659136 Don't cookoff when commander turret is hit (#4280) 2016-08-23 09:57:54 +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
Glowbal
f908486468 Merge pull request #4270 from acemod/travisForDocs
Run documentation dependencies extractor on Travis deployment
2016-08-21 00:20:54 +02:00
jonpas
2182b2c742 Run documentation dependencies extractor on Travis deployment 2016-08-21 00:02:00 +02:00
Glowbal
fca643849a Merge pull request #4277 from acemod/fix-req-addons-hearing
Remove superfluous requiredAddons in hearing
2016-08-20 21:53:21 +02:00
commy2
cda100c9e7 Remove superfluous requiredAddons in hearing 2016-08-20 21:10:37 +02:00
Glowbal
d911dab5a7 Merge pull request #4191 from acemod/fix-4181
add explosive devices to missing units, close #4181
2016-08-20 12:25:56 +02:00
Glowbal
83e78f1021 Merge pull request #4258 from acemod/reviveTimer
Clear reviveState when calling setUnconscious
2016-08-20 11:57:51 +02:00
Glowbal
47d17c49dc Merge pull request #4245 from acemod/eject-ai-crew-cookoff
eject ai during cookoff
2016-08-20 11:56:40 +02:00
Glowbal
167dc7735d Merge pull request #4197 from acemod/litterSimpleObject
Use createSimpleObject for medical litter
2016-08-20 11:53:43 +02:00
jonpas
4d81a21e3f Read git version from file as back up in make.py (#4247)
* Read git version from file rather than using Git client

* Use git files reading only as fallback
2016-08-20 11:52:18 +02:00
Glowbal
1f8f463f32 Merge pull request #4267 from acemod/fix-object-event
fix FUNC(objectEvent)
2016-08-20 11:49:53 +02:00
PabstMirror
7f9a697dca Update CBA_DEBUG_SYNCHRONOUS macro for new CBA (#4271) 2016-08-19 16:33:27 -05:00
commy2
1c6825bcab skip DLL check on non-windows machines, close #4253 2016-08-19 16:01:59 +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
commy2
91e4f50ba0 fix FUNC(objectEvent) 2016-08-19 15:23:47 +02:00
bux578
4f3ff2c967 fixes 2016-08-19 15:20:22 +02:00
jonpas
00927f1a38 Merge pull request #4264 from acemod/fixInteractMenuWikiList
Fix list in interaction menu framework documentation
2016-08-19 01:13:59 +02:00
jonpas
3884821eb1 Fix list in interaction menu framework documentation 2016-08-19 00:57:19 +02:00
jonpas
f2a7bb4083 Merge pull request #4263 from acemod/wiki-removeNotIncludedRearmFeature
Remove never-merged rearm feature and framework documentation
2016-08-19 00:01:55 +02:00
jonpas
58bf3c4719 Remove never-merged rearm feature and framework documentation 2016-08-18 21:01:44 +02:00
jonpas
ff0dcd3152 Use pushBackUnique in Tags cache (#4249)
* Use pushBackUnique in tagging

* Use configProperties, Add maintainers

* Fix header

* Revert to configClasses
2016-08-18 20:52:28 +02:00
jonpas
b22a4bee60 Update documentation development environment instructions 2016-08-18 20:45:39 +02:00
jonpas
986ac43a68 Cache config UI (#4234)
* Cache config UI

* Use configClasses to prevent reading entries in base class

* Fix header not containing return value

* One more count

* More lazy eval
2016-08-18 19:07:05 +02:00
bux578
468662b46e Create CNAME 2016-08-18 19:00:17 +02:00
bux578
04036f5fdf Merge pull request #4259 from acemod/mergeDocs
merge gh-pages content into docs folder
2016-08-18 18:52:40 +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