Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,133 Commits 73 Branches 88 Tags 752 MiB
424c6fe878
Commit Graph

9133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jonpas
168ec5344d Fix #3363 lamp unloading bug, Correct cargo menu button classnames 2016-02-23 22:17:36 +01:00
Thomas Kooi
52108b1737 Merge pull request #3382 from acemod/doAnimEvents 
ObjectEvent Func, swap execRemoteFnc in doAnim
 2016-02-23 18:38:43 +01:00
jokoho48
0956b97dce remove module settings 
change defualt in ACE_Settings
 2016-02-23 15:49:03 +01:00
jokoho48
c61763edc9 fix simicolon 
add stringtable entrys
 2016-02-23 15:37:28 +01:00
jokoho48
b2d2bec2cf Merge branch 'master' of https://github.com/acemod/ACE3 into delayUnconCaptiv 
# Conflicts:
#	addons/medical/functions/fnc_setUnconscious.sqf
 2016-02-23 15:31:38 +01:00
esteldunedain
e6af2864eb Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2016-02-23 09:27:23 -03:00
Nicolás Badano
31bcc2c133 Merge pull request #3396 from jiripolasek/patch-1 
Add protocol version to meta.cpp
 2016-02-23 09:00:48 -03:00
Jiří Polášek
0059d7c871 Add protocol version to meta.cpp 
Without protocol version attribute Arma 3 Server ignores publishedid attribute.
 2016-02-23 12:15:51 +01:00
bux578
aa8d3a3fd0 Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis 
Unified ellipsis
 2016-02-23 08:27:28 +01:00
BaerMitUmlaut
74ea79e2cc Unified ellipsis 2016-02-22 23:51:47 +01:00
PabstMirror
a4391a713d Cleanup old cba SLX_XEH_COMPILE_NEW code 2016-02-22 15:30:16 -06:00
jonpas
f7d89479f5 Move jonpas to Core Team in AUTHORS.txt and remove typo 2016-02-22 22:08:10 +01:00
PabstMirror
37eb353edf Cleanup Merge 2016-02-22 15:03:40 -06:00
PabstMirror
6dc0d7d4f5 Merge branch 'master' into moreSevereJamming 2016-02-22 14:57:40 -06:00
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
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
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
commy2
2b9518bf81 use precompiled function for vector display 2016-02-21 22:41:11 +01:00
commy2
da0d37ed0d remove commented out code 2016-02-21 22:31:14 +01:00
commy2
3f855298e2 remove unused mapDisplayLoaded event and ACE_dlgMap variable 2016-02-21 22:23:46 +01:00
commy2
f43e88ff25 replace zeusDisplayChanged with DisplayLoad event 2016-02-21 22:16:12 +01:00
commy2
4335bfbfcf replace inventoryDisplayLoaded with DisplayLoad event 2016-02-21 21:24:39 +01:00
licht-im-Norden87
5e0f109b4c Update stringtable.xml 2016-02-21 21:15:38 +01:00
commy2
e9808bf20b remove unused PFH check 2016-02-21 20:42:06 +01:00
licht-im-Norden87
00c8f7bdef mk6 2016-02-21 20:30:57 +01:00
commy2
5e486869c0 replace mainDisplayLoaded event with DisplayLoad XEH and add ACE version to main menu (CBA help) 2016-02-21 20:26:30 +01:00
licht-im-Norden87
4036dcaa8e Update stringtable.xml 2016-02-21 20:05:26 +01:00
licht-im-Norden87
62dc2ffd06 Update stringtable.xml 2016-02-21 20:04:32 +01:00