bux
8063163b9c
Merge branch 'licht-im-Norden87-patch-25'
2016-02-18 20:06:39 +01:00
bux
49f565f541
fix merging errors
2016-02-18 20:05:30 +01:00
esteldunedain
2dd835b56b
Substantially increase overheating when using silencers or flash suppresors. Optimize overheating calculations for the player through caching.
2016-02-18 15:58:44 -03:00
ViperMaul
14c5558bbf
Merge branch 'master' of https://github.com/acemod/ACE3
2016-02-18 10:50:52 -08:00
ViperMaul
52b3f1e219
Bump version to 3.4.3
2016-02-18 10:50:33 -08:00
bux578
93e655588b
Merge pull request #3294 from gienkov/pltranslations
...
pl translation
2016-02-18 19:38:43 +01:00
bux
52438856fe
Merge branch 'looterz-issue-template'
2016-02-18 19:30:32 +01:00
bux
e2d072973e
adjust wording in github templates, add pr template
2016-02-18 19:29:33 +01:00
bux
cec86bf895
Merge branch 'issue-template' of https://github.com/looterz/ACE3 into looterz-issue-template
2016-02-18 19:21:51 +01:00
bux578
178ca42fab
Merge pull request #3336 from acemod/steamWSServer
...
Add steam workshop support
2016-02-18 19:18:00 +01:00
looterz
092906b19e
Moved ISSUE_TEMPLATE.md and CONTRIBUTING.md to the new .github folder
2016-02-18 11:54:39 -06:00
esteldunedain
2a8410650a
Swap createLocation by CBA_fnc_createNamespace
2016-02-18 13:58:18 -03:00
esteldunedain
0236c16e8f
Cache volume attenuation due to earplugs and headgear
2016-02-18 13:48:40 -03:00
bux
34691decdf
add meta.cpp to make.py importantFiles array
2016-02-18 17:00:19 +01:00
Thomas Kooi
bf082e928d
Merge pull request #3283 from acemod/reflectionsDefaultOff
...
Make explosion reflections optional, default off
2016-02-18 16:50:19 +01:00
esteldunedain
87dd607901
Add a category name to frag settings
2016-02-18 12:28:00 -03:00
esteldunedain
a8131f597a
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into reflectionsDefaultOff
2016-02-18 12:18:51 -03:00
bux
7bd553fd13
add steam workshop support
...
https://community.bistudio.com/wiki/How_to_enable_Steam_Workshop_support_in_Server_Browser
2016-02-18 16:08:37 +01:00
commy2
50b04d937b
Merge pull request #3278 from acemod/removeragdolls
...
remove old ragdoll tweaks
2016-02-18 14:46:21 +01:00
commy2
cf4f47160f
Merge pull request #3275 from acemod/realnamebadger
...
correct name for wheeled apc 01 cannon
2016-02-18 14:44:24 +01:00
commy2
be8f7f9cc0
Merge pull request #3276 from acemod/156selectapply
...
replace filter and map with select and apply
2016-02-18 14:23:02 +01:00
commy2
9851ed6d3d
Merge pull request #2893 from acemod/155selectRandom
...
1.55 use new selectRandom command
2016-02-18 14:22:52 +01:00
commy2
5d9f622bf8
Merge pull request #3277 from acemod/updatetoolscba
...
update cba files under tools
2016-02-18 14:20:26 +01:00
esteldunedain
88eae19646
Replace execRemoteFnc in ace_medical
2016-02-17 22:54:43 -03:00
PabstMirror
be742c13cd
Merge branch 'master' into 155selectRandom
2016-02-17 15:58:19 -06:00
PabstMirror
c456e1a631
Merge pull request #3214 from acemod/cba23
...
Changes for CBA 2.3
2016-02-17 15:33:42 -06:00
PabstMirror
53d870b62a
Merge pull request #3312 from acemod/passengerInteraction
...
Only get passenger actions for selected unit
2016-02-17 15:33:29 -06:00
PabstMirror
77f5aebf73
Merge pull request #3282 from acemod/eventLocationHash
...
Use location hash for ace events
2016-02-17 15:32:50 -06:00
looterz
5af028e37f
Changing filename to ISSUE_TEMPLATE.md as in github specs
2016-02-17 14:39:45 -06:00
looterz
0643fda093
Changing letter case
2016-02-17 14:38:53 -06:00
Thomas Kooi
a8846e92ee
Merge pull request #2954 from gienkov/nozzleLogic
...
nozzle additonal check condition
2016-02-17 21:26:04 +01:00
PabstMirror
dccc1d33fd
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
Thomas Kooi
e31e20bd42
Merge pull request #3293 from acemod/fix3270
...
Slightly reduce the distance for which the LOS check is skipped.
2016-02-17 18:39:39 +01:00
Thomas Kooi
26cb6bd6a3
Merge pull request #3326 from acemod/makeAdvMedicalWoundsConsistant
...
Make wound assignment consistent for dll/sqf
2016-02-17 18:34:28 +01:00
Thomas Kooi
8e49c8b1b3
Merge pull request #3323 from acemod/fixVehicleCrashes
...
Fix vehicle crashes
2016-02-17 18:32:56 +01:00
looterz
56c96d0eb3
ArmA changed to Arma
2016-02-17 10:33:27 -06:00
looterz
15d9adce2b
Added issue_template.md
2016-02-17 10:24:31 -06:00
PabstMirror
930c2f84c6
Call updateHearingProtection at settings init
2016-02-17 09:49:00 -06:00
PabstMirror
40396fc69e
Remove debug
2016-02-17 09:37:08 -06:00
PabstMirror
649b0c28e2
Calculate hearing protection coefficient on events
2016-02-16 18:17:42 -06:00
PabstMirror
8fed9325c9
Fix flashbang
2016-02-16 13:02:25 -06:00
PabstMirror
749425dfb7
Settings Category, Minor Cleanup
2016-02-16 12:58:42 -06:00
PabstMirror
f1797feead
Make wound assignment consistent for dll/sqf
...
Dll now exits on first match for threshold damage (exitWith)
Remove random wound in sqf to match dll
Fix backblast threshold order
Add lower vehiclecrash threshold
Add dll version logging
2016-02-16 12:19:18 -06:00
bux578
9c67710bf3
Merge pull request #3324 from acemod/makeChangesForCI
...
change make.py to accept --ci arg
2016-02-16 17:47:52 +01:00
commy2
d9dd5ba755
Merge pull request #3325 from acemod/fixfakeriflein3den
...
remove ace fake weapon from 3den cargo editor
2016-02-16 16:29:36 +01:00
commy2
1bc73af1c9
remove ace fake weapon from 3den cargo editor
2016-02-16 16:11:18 +01:00
bux578
067f88ff42
change make.py to accept --ci arg
2016-02-16 15:46:10 +01:00
bux578
8ec7063206
add proper exit code when build is failing
2016-02-16 13:44:43 +01:00
bux578
245a9d43d1
fix - args being recognized as modules
2016-02-16 13:26:47 +01:00
bux578
dacb5e1748
add --ci switch to make.py
...
to signal the end of the process to an automated build
2016-02-16 13:14:28 +01:00