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,404 Commits 73 Branches 88 Tags 752 MiB
10d20472d3
Commit Graph

9404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bux578
ed05d2f1e7 Merge pull request #3414 from acemod/spanishTranslation3.5.0 
Spanish translation3.5.0
 2016-02-25 15:45:38 +01:00
jonpas
b2b781957f Reimplement old parameter syntax for (Un)LoadCargo events 2016-02-25 15:35:47 +01:00
looterz
b354fed39a Moved _playersToDrawMarkers into BFT_ShowPlayerNames code region 2016-02-25 08:35:33 -06:00
looterz
00f06f81d1 Added Show Player Names option to Blue Force Tracking Module 2016-02-25 07:57:32 -06:00
esteldunedain
71707bc81a Some spanish translations for 3.5.0 2016-02-25 10:54:19 -03:00
jonpas
36d5c40b06 Merge pull request #3411 from GitHawk/refuel_api 
Refuel change documentation header for API fnc
 2016-02-25 14:52:25 +01:00
Nicolás Badano
23d35cf9f7 Merge pull request #3412 from GitHawk/rearm_api 
Rearm added API
 2016-02-25 10:42:28 -03:00
esteldunedain
e8b71bb2d6 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into spanishTranslation3.5.0 2016-02-25 09:58:42 -03:00
Nicolás Badano
da46a1c0cd Merge pull request #3408 from acemod/moduleDescriptions 
Cleanup some module descriptions
 2016-02-25 09:56:31 -03:00
Nicolás Badano
d02a590886 Merge pull request #3406 from acemod/diePurista 
Replace Purista with Roboto - everywhere
 2016-02-25 09:56:16 -03:00
Nicolás Badano
91e671085e Merge pull request #3371 from acemod/moreSevereJamming 
More severe jamming
 2016-02-25 09:56:08 -03:00
Nicolás Badano
d037512c81 Merge pull request #3405 from acemod/3k404 
remove unused non API functions
 2016-02-25 09:55:22 -03:00
Nicolás Badano
ae2ce0eebc Merge pull request #3124 from acemod/delayUnconCaptiv 
add delay to Unconsciousness Captivity
 2016-02-25 09:54:27 -03:00
esteldunedain
4f6fa74690 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2016-02-25 09:51:56 -03:00
esteldunedain
56d202fc13 Revert "Comment out 3den Attributes until BIS properly solves http://feedback.arma3.com/view.php?id=28031" 
This reverts commit aea02af618.
 2016-02-25 09:51:42 -03:00
bux578
6070d29f59 Merge pull request #3386 from licht-im-Norden87/patch-53 
German translation Update: MK6 Mortar
 2016-02-25 13:38:42 +01:00
GitHawk
6deecb0559 Add missing bracket 2016-02-25 10:25:57 +01:00
GitHawk
2f183548b6 Added API 2016-02-25 10:18:31 +01:00
GitHawk
5af31f6bb3 Remove brackets 2016-02-25 10:11:28 +01:00
GitHawk
53457cfe61 Change documentation header for API fnc 2016-02-25 10:08:20 +01:00
jonpas
1402985133 Fix typos 2016-02-24 19:34:03 +01:00
jonpas
a3d769c410 Cleanup some module descriptions, close #2561 2016-02-24 19:22:16 +01:00
jonpas
804456c722 Sort requiredAddons alphabetically 2016-02-24 18:35:52 +01:00
PabstMirror
8cb1546569 Add threeden to required addons and vers to 1.56 2016-02-24 10:52:34 -06:00
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