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,279 Commits 73 Branches 88 Tags 752 MiB
95007d8ccd
Commit Graph

9279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Diego Badano
5af4e1ca25 Fix trace 2016-02-24 12:17:48 -03:00
Nicolas Diego Badano
c6f6e4e9f7 Let this finally fix it please 2016-02-24 12:14:47 -03:00
jonpas
8f775dfba4 Rename FontCSE macro to FONT_ACE 2016-02-24 15:08:54 +01:00
jonpas
7f022eda00 Replace Purista with Roboto - everywhere, close #3401 2016-02-24 15:06:27 +01:00
commy2
02b2a21300 remove unused non API functions 2016-02-24 10:10:31 +01:00
commy2
8233661d55 remove unused non API functions 2016-02-24 09:39:39 +01:00
PabstMirror
7cf912222b Merge pull request #3393 from acemod/3denReplaceDropDown 
Fix 3den attributes
 2016-02-23 17:09:03 -06:00
PabstMirror
a437326032 Merge pull request #3400 from acemod/fixLampUnload 
Fix lamp unloading
 2016-02-23 17:07:31 -06:00
esteldunedain
b2c672e6c7 Apply the same pattern to ACE_Markers 2016-02-23 19:32:39 -03:00
esteldunedain
b32732cad0 Delete the logic and group after used 2016-02-23 19:29:18 -03:00
esteldunedain
66fa18888e Use the logic directly to determine client 2016-02-23 18:53:33 -03:00
Nicolás Badano
b55648ccb4 Merge pull request #3402 from acemod/fixCutG 
Fix #3334 replace Purista with Roboto in cargo menu
 2016-02-23 18:48:06 -03:00
commy2
b08ae7a266 Merge pull request #3395 from acemod/cba23compile 
Cleanup old cba SLX_XEH_COMPILE_NEW code
 2016-02-23 22:43:42 +01:00
jonpas
60fba483fe Fix #3334 replace Purista with Roboto in cargo menu 2016-02-23 22:30:15 +01:00
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
esteldunedain
f9ef100fad Broadcast client 2016-02-23 11:56:46 -03: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
056244602d Get the client ID from a new logic object 2016-02-23 10:09:55 -03:00
esteldunedain
ec88e4ad32 Revert "Comment out 3den Attributes until BIS properly solves http://feedback.arma3.com/view.php?id=28031" 
This reverts commit aea02af618.
 2016-02-23 09:55:37 -03:00
esteldunedain
645ed3e63d Resync mine orientations in JIP. Fix #3317 2016-02-23 09:53:38 -03: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
BaerMitUmlaut
b2337d7485 Config cleanup 2016-02-22 22:21:13 +01: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
BaerMitUmlaut
b72751e693 Fixed macro 2016-02-22 21:06:26 +01:00
BaerMitUmlaut
c2856fd8c7 Fixed scopes 2016-02-22 20:58:55 +01: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