Commit Graph

10010 Commits

Author SHA1 Message Date
PabstMirror
9ec4135be9 Add prep 2016-02-22 12:27:27 -06:00
PabstMirror
eb08149946 Merge branch 'master' into doAnimEvents 2016-02-22 12:27:07 -06:00
licht-im-Norden87
d13e1272ce Update stringtable.xml 2016-02-22 18:55:45 +01:00
PabstMirror
330792ba7a Add medic threeden control 2016-02-22 11:26:32 -06:00
commy2
c721cbf865 Merge pull request #3392 from acemod/fix3391
fix error when loading save game, fix #3391
2016-02-22 17:55:34 +01:00
commy2
a09cb1612b fix error when loading save game, fix #3391 2016-02-22 17:43:34 +01:00
commy2
dc16136aef Merge pull request #3366 from acemod/cbacanuseweapon
replace some ace_common_fnc_X with CBA_fnc_X
2016-02-22 16:28:57 +01:00
commy2
4aa3eee04e Merge pull request #3390 from acemod/removebwa3compat
remove BWA3 compat pbo (changes now in BW mod)
2016-02-22 16:24:33 +01:00
commy2
9712f9c1a4 manual merge 2016-02-22 16:24:10 +01:00
commy2
5334b228fb remove BWA3 compat pbo (changes now in BW mod) 2016-02-22 16:18:11 +01:00
commy2
939cd65721 Merge pull request #3369 from acemod/usedisplayloadxeh
displayLoad xeh for imenu
2016-02-22 16:15:12 +01:00
commy2
72fe155cda manual merge 2016-02-22 16:11:10 +01:00
commy2
ac3385fb83 manual merge 2016-02-22 16:08:24 +01:00
commy2
c45523475f manual merge 2016-02-22 16:06:30 +01:00
commy2
0f7bfc0f66 Merge pull request #3389 from acemod/precompileongamestart
precompile on game start
2016-02-22 16:00:19 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
BaerMitUmlaut
06f8f277ac Added Eden Integration 2016-02-22 14:40:21 +01:00
BaerMitUmlaut
af834838ef Moved FRIES equipping into seperate function 2016-02-22 14:40:04 +01:00
PabstMirror
e6052aee1f Fix captives 3den 2016-02-22 03:00:40 -06:00
PabstMirror
ed96307f2f 3den repair - Replace bad combo with custom control 2016-02-22 02:50:20 -06:00
bux578
55a6ef1937 Merge pull request #3367 from licht-im-Norden87/patch-43
Update German Stringtable
2016-02-22 08:26:23 +01:00
esteldunedain
aea02af618 Comment out 3den Attributes until BIS properly solves http://feedback.arma3.com/view.php?id=28031 2016-02-21 23:47:47 -03:00
BaerMitUmlaut
ea92424d15 Added license file for TOH anims 2016-02-22 01:21:02 +01:00
BaerMitUmlaut
05054737ab Removal of virtual rope anchor, animation fix 2016-02-22 00:31:33 +01:00
BaerMitUmlaut
6b2dc78ea4 Fixed moduleEquipFRIES header 2016-02-22 00:31:32 +01:00
BaerMitUmlaut
671fcd90b4 Integrated new model, fixed config, added Kasatka door animation 2016-02-22 00:31:31 +01:00
BaerMitUmlaut
c917cdab8d New FRIES model, new animations 2016-02-22 00:31:29 +01:00
BaerMitUmlaut
c1ea6fd327 Fixed locality issues, moved rope creation and simulation to server
Fix rope cut while fastroping

Locality fix pt2 - serverside ropes
2016-02-22 00:31:28 +01:00
BaerMitUmlaut
8f49715ae6 Cleanup function params and headers
Cleanup function params and headers

Removed unecessary param
2016-02-22 00:31:27 +01:00
BaerMitUmlaut
8cfbbe4f1f Skip FRIES preparation if unnecessary 2016-02-22 00:31:26 +01:00
BaerMitUmlaut
953119a411 Bugfix for static FRIES 2016-02-22 00:31:25 +01:00
BaerMitUmlaut
996a5105fc Model update 2016-02-22 00:31:25 +01:00
BaerMitUmlaut
b2fd7f93b5 Cleanup privates and function params 2016-02-22 00:31:24 +01:00
BaerMitUmlaut
e5c0b5afd3 Added empty fire LOD to helper 2016-02-22 00:31:23 +01:00
BaerMitUmlaut
7d90f707c0 Improved config 2016-02-22 00:31:22 +01:00
BaerMitUmlaut
cc1a54d900 Updated model 2016-02-22 00:31:22 +01:00
BaerMitUmlaut
7241e703ae Code cleanup, restructured rope deployment 2016-02-22 00:31:21 +01:00
BaerMitUmlaut
2695fc6beb Better twitching fix, failsaves and EHs 2016-02-22 00:31:20 +01:00
BaerMitUmlaut
3ec9369a9e Added FRIES object, FRIES module, debugging code 2016-02-22 00:31:20 +01:00
BaerMitUmlaut
12779b03bf Glitchy rope fix 2016-02-22 00:31:19 +01:00
BaerMitUmlaut
774984dbac Added possibility for memory point rope origins 2016-02-22 00:31:18 +01:00
BaerMitUmlaut
554c6b14e0 Tweaked interaction conditions 2016-02-22 00:31:17 +01:00
BaerMitUmlaut
890171e629 Added rope origins for all vanilla helicopters 2016-02-22 00:31:17 +01:00
BaerMitUmlaut
c70ab0b332 Buggy ropes workaround 2016-02-22 00:31:16 +01:00
BaerMitUmlaut
eb028c0d1b Initial commit fastroping 2016-02-22 00:31:15 +01:00
commy2
f4a985fdfd Merge pull request #3345 from acemod/jrCompat338
Add flashsupressor to asdg_MuzzleSlot_338
2016-02-21 23:46:50 +01:00
commy2
dd10fac470 use DisplayLoad for main menu box and to disable options when world=Empty 2016-02-21 23:28:02 +01:00
commy2
9ac1f8fc47 use DisplayLoad for turretDisplayLoaded event 2016-02-21 23:13:26 +01:00
commy2
4c0a817ba8 use precompiled function for optics display 2016-02-21 22:56:35 +01:00
commy2
e1db193099 remove unused config and remove some wrong base classes 2016-02-21 22:50:15 +01:00