Commit Graph

9895 Commits

Author SHA1 Message Date
Glowbal
05aac2d223 Add store new helper object
Fixes an issue were you end up with many helper objects that are not cleaned up
2016-06-16 14:57:26 +02:00
VKing
d5f8d965f3 Change ace_time to cba_missionTime 2016-06-12 17:22:44 +02:00
VKing
6b62436cfb Delete unused animation files 2016-06-12 16:29:00 +02:00
VKing
fe18107077 Fix cfgPatches entries 2016-06-12 16:28:42 +02:00
VKing
7f3aacb4d6 Add mass to metal detectors
Based on values from the manufacturer's pamphlet (vallon.de)
2016-06-12 12:41:59 +02:00
VKing
12130c8c3a Add description string 2016-06-12 10:19:06 +02:00
VKing
3c85398d87 Clean up the sound config 2016-06-12 10:17:02 +02:00
PabstMirror
ddf9e0b5cc CBA Events 2016-06-11 14:57:04 -05:00
PabstMirror
00e5cef145 Merge remote-tracking branch 'refs/remotes/origin/master' into add-mine-detector 2016-06-11 14:49:12 -05:00
commy2
250e27bfd2 Merge pull request #3864 from acemod/removeLineDrawing
Remove line drawing
2016-06-11 21:38:56 +02:00
Butt4cak3
151d13244b Improved misleading translation of german bandages (#3810)
* Improved misleading translation of german bandages

* Further improved german bandage names
2016-06-11 21:35:22 +02:00
Glowbal
7f9257716e Merge pull request #2331 from acemod/323bloodyoverlay
remove BI blood overlay
2016-06-11 20:49:54 +02:00
VKing
589ad4d2e7 Remove attachments from mine detectors
When WeaponSlotsInfo was added, rifle attachments could be added to the mine detectors.
2016-06-11 20:47:53 +02:00
commy2
a4bd6ea80f Merge pull request #3893 from acemod/virtualMasDiv0
virtualMass - Fix div0 error when naked
2016-06-10 10:27:36 +02:00
commy2
e55881e1ef Merge pull request #3894 from acemod/fixNametagsUAV
Fix nametag error when assignedTeam is nil
2016-06-10 10:20:16 +02:00
Glowbal
bbb8bafa1c Merge pull request #3895 from acemod/devHandleDamage
Temp fix for change to handleDamage in dev branch
2016-06-10 09:28:44 +02:00
PabstMirror
dc6d5f1367 Temp fix for change to handleDamage in dev branch
Fix #3892
2016-06-09 21:26:50 -05:00
PabstMirror
5ecc09d78c Fix nametag error when assignedTeam is nil 2016-06-09 20:42:30 -05:00
PabstMirror
e8f7f6ea24 virtualMass - Fix div0 error when playing as rabbit 2016-06-09 20:30:45 -05:00
PabstMirror
d7d87be32b Merge remote-tracking branch 'refs/remotes/origin/master' into removeLineDrawing 2016-06-09 17:20:39 -05:00
Glowbal
c3d984d6e7 Merge pull request #3840 from acemod/eol-lf
Convert to LF line endings
2016-06-10 00:15:51 +02:00
jonpas
3389720f6b Merge branch 'master' into eol-lf 2016-06-10 00:12:07 +02:00
jonpas
1c06764d03 Add Extract Dependencies script (#2640)
* Add Extract Dependencies Python script, Add tools\temp to .gitignore

* Change backtick to single quote

* Remove unnecessary import

* Remove all whitespace

* Add support for multi-line dependencies, Add header comment, Improve

* Fix final message

* Update output to Jekyll IF statements for inclusion on pages

* Space

* Correct comments for Jekyll usage
2016-06-09 14:59:26 +02:00
jonpas
f1ae73967d Normalize leftovers 2016-06-09 14:28:31 +02:00
jonpas
b97ba4990d Normalize 2 more files 2016-06-09 14:25:57 +02:00
jonpas
bd5f6107a0 Merge branch 'master' into eol-lf 2016-06-09 14:24:45 +02:00
Glowbal
8c9b31b1c7 Merge pull request #3815 from acemod/cbaEventSystem
Deprecate ACE events framework
2016-06-09 14:20:26 +02:00
commy2
24ce8b7753 Merge pull request #3880 from acemod/spotting_scope_animated_reticle
Update Spotting Scope
2016-06-07 19:41:09 +02:00
commy2
5d0e257cd8 center interaction point, add gunner shadows 2016-06-07 19:36:03 +02:00
PabstMirror
1be926f3db Make rotation key a client setting
Improve compatibility with other addons
2016-06-07 11:52:28 -05:00
PabstMirror
aea086b75e Merge branch 'cbaEventSystem' into removeLineDrawing 2016-06-07 11:12:52 -05:00
BaerMitUmlaut
bce92e8d42 Merge pull request #3567 from BaerMitUmlaut/microdagr-microoverhaul
MicroDAGR Microoverhaul
2016-06-07 09:58:18 +02:00
commy2
f14a1b990b simplify optics config 2016-06-07 07:38:01 +02:00
Nicolás Badano
527db2bd07 Merge pull request #3884 from acemod/fixShowWindInfoControlsText
Fix wind info keybind string
2016-06-06 21:39:54 -03:00
Nicolás Badano
56d604b2d7 Merge pull request #3883 from acemod/explosivePickUpMainAction
Move Defuse action to main action
2016-06-06 21:36:38 -03:00
jonpas
89db8bef5a Fix wind info keybind string 2016-06-07 02:22:53 +02:00
jonpas
9287214781 Move Defuse action to main action 2016-06-07 00:51:06 +02:00
commy2
5135d3bedd delete duplicate files 2016-06-07 00:36:41 +02:00
commy2
3ee10a8c2f add gunner proxy to FIRE GEO LOD and add it to a component 2016-06-07 00:28:09 +02:00
commy2
f5a96ac2fc add editor stuff for spotting scope 2016-06-07 00:17:04 +02:00
commy2
12ab4e9fa6 match controls at boarder 2016-06-06 23:33:00 +02:00
commy2
6a5c9cfca7 black periphery 2016-06-06 23:14:19 +02:00
commy2
36d0b78811 coeficient handling interface sizes was inverted 2016-06-06 21:36:29 +02:00
commy2
cd43c17f80 animate the scope 2016-06-06 19:22:24 +02:00
commy2
be260e896b animated reticle for spotting scope 2016-06-06 17:22:17 +02:00
commy2
a61e4b3a4e remove BI blood overlay 2016-06-06 14:14:45 +02:00
commy2
fe03272dc6 Merge pull request #3874 from acemod/cleanup_nightvision
code cleanup fnc_blending
2016-06-06 12:23:42 +02:00
jonpas
e779bc0cb2 Merge pull request #3877 from acemod/fixUIerror
Fix selective UI in FFV slots
2016-06-05 14:04:49 +02:00
jonpas
021a123fc6 Fix selective UI in FFV slots, Properly fix config name check 2016-06-05 14:02:55 +02:00
Glowbal
2ad3f57414 Merge pull request #3872 from acemod/fixUIerror
Fix selective UI script error when changing certain other settings
2016-06-05 13:44:22 +02:00