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
15,097 Commits 73 Branches 88 Tags 752 MiB
7054d4bb51
Commit Graph

103 Commits

Author SHA1 Message Date
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
PabstMirror
db50b5313d getName can return raw or sanatized html tags 2015-12-11 12:01:50 -06:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
commy2
34d351c652 fix exitWith capitalization 2015-11-30 17:14:05 +01:00
commy2
dcf0a68b80 Revert "fix Cfg capitalization" 
This reverts commit 43bda9c462.
 2015-11-30 17:00:32 +01:00
commy2
43bda9c462 fix Cfg capitalization 2015-11-30 16:52:20 +01:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
Glowbal
478b618e4b Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros 
Feature/switch to log macros
 2015-09-15 14:51:23 +02:00
KoffeinFlummi
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
Michael Braun
5047d4de1c Switched to ACE_LOG<LEVEL>_# variation 2015-08-26 17:39:44 +02:00
Michael Braun
097506076f Fixed format usage in macros requiring ARR_# for it to work 2015-08-26 16:48:55 +02:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
PabstMirror
b9db03de20 Fix count problems 2015-08-14 20:13:41 -05:00
jokoho48
156609aab2 Code cleanup of Disarming module 2015-08-09 05:18:26 +02:00
jonpas
541f1010a7 Merge branch 'master' into macroSTR 
Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml
 2015-06-02 22:14:32 +02:00
PabstMirror
f57427ec96 switch waitAndExecute with 0 delay to execNextFrame 
Should Fix #1463
 2015-06-01 13:14:05 -05:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
PabstMirror
2da2794e20 ACE_isUnique config for mags instead of static list 2015-05-09 17:08:47 -05:00
PabstMirror
2e3e203d9f #1081 - Fix binocular dupe 
binocs are weapons and items at the same time.
need to properly drop binocs because stuff like deisgnator can have ammo
 2015-05-09 14:41:46 -05:00
ToasterBR
021b00c722 Translation to Portuguese 
Done all remaining portuguese translations, including some minor
corrections
 2015-05-02 03:38:53 -03:00
Harakhti
4e165e2572 Update Hungarian translations 
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
 2015-04-30 13:25:25 +02:00
ulteq
50a8a89b28 Added missing privates 2015-04-30 10:50:49 +02:00
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
PabstMirror
638433614c Some missing private defines. 2015-04-16 12:36:16 -05:00
KoffeinFlummi
f020ff7c53 Merge branch 'patch-7' of https://github.com/ramius86/ACE3 into italian-merge 
Conflicts:
	addons/disarming/stringtable.xml
 2015-04-15 22:08:15 +02:00
ruPaladin
7051152d93 Update stringtable.xml 2015-04-15 19:53:42 +03:00
KoffeinFlummi
250d6acb22 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 2015-04-15 16:09:40 +02:00
Marco
aaee9c72c1 Update stringtable.xml 
Italian translation
 2015-04-15 10:44:13 +02:00
KoffeinFlummi
b563bf8a8e Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-14 15:04:42 +02:00
Kllrt
1c611ba2db Added another new CZ strings 2015-04-13 21:15:04 +02:00
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +02:00
bux578
9184ef479a add disarm icon, add action psd, move icon files 2015-04-12 14:47:08 +02:00
Legolasindar
4bb9f0cf77 Update stringtable.xml 
added spanish translate
 2015-04-12 14:27:42 +02:00
licht-im-Norden87
d0fb387255 Update Stringtable: Disarming 2015-04-12 13:45:47 +02:00
PabstMirror
c055911231 Cleanup, remove debug spam 2015-04-04 00:52:21 -05:00
PabstMirror
ee961ed1e6 Fix Dropping Unique Magazines 2015-03-29 14:47:57 -05:00
PabstMirror
0dcb1dfab8 GUI 2015-03-20 20:48:39 -05:00
PabstMirror
22483ce22e Fix ranks, and uniform/vest drop 2015-03-20 20:47:34 -05:00
PabstMirror
52623f71b8 Use Inventory Scaling Option 2015-03-20 20:27:04 -05:00
PabstMirror
38745f4871 Various Changes 2015-03-20 20:17:49 -05:00
PabstMirror
9f25641f54 Verify Mag counts, headers, check animation 2015-03-17 14:43:50 -05:00
PabstMirror
14c45afd99 Sync holder gvar 2015-02-27 18:56:15 -06:00
PabstMirror
af1544ebb9 fix name 2015-02-27 18:50:08 -06:00
PabstMirror
641cbb7f64 Dialog Stuff 2015-02-27 18:43:42 -06:00
PabstMirror
d31c19c3eb Seems like it's working 2015-02-27 18:38:23 -06:00
PabstMirror
32f67487b5 More Work 2015-02-27 16:16:35 -06:00
PabstMirror
d55aed0813 Inv Screen Rough WIP 2015-02-27 15:23:46 -06:00
PabstMirror
744f37d18a DragandDrop Frisking WIP 2015-02-22 18:44:33 -06:00
PabstMirror
69835ec7fb Fix HMD bug and disarm types 2015-02-11 14:37:18 -06:00
PabstMirror
a7004cf0e9 Disarm Types Examples 2015-02-11 02:33:18 -06:00
PabstMirror
13c9db75a7 Disarming Prototype 2015-02-10 19:55:53 -06:00