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
4,411 Commits 73 Branches 88 Tags 752 MiB
54dcbb9ef4
Commit Graph

3752 Commits

Author SHA1 Message Date
Glowbal
50cc5db92f fixes #1017 2015-05-05 20:05:31 +02:00
Glowbal
a49feee76b should have been defaultValue 2015-05-05 19:47:17 +02:00
Glowbal
cee83113d2 lets use proper module config for this 2015-05-05 19:44:56 +02:00
Glowbal
9abf8a15c1 Make certain that GVAR(BodyRemoveTimer) exists 2015-05-05 19:44:44 +02:00
Glowbal
d88d71e2b3 Merge pull request #1015 from alganthe/master 
New anim update
 2015-05-05 19:35:31 +02:00
jaynus
8f19c13d85 Merge pull request #1009 from acemod/fixMissleGuidanceInhertiacnes 
MissleGuidance - fix Inheritance check
 2015-05-05 10:31:40 -07:00
Josuan Albin
dd2ea99d15 pak 
pak anim
 2015-05-05 19:26:11 +02:00
Josuan Albin
f063e45e60 medical advanced added 
animations added for advanced
 2015-05-05 19:04:08 +02:00
Josuan Albin
b781264212 New anim update 
new healing animation added to animationCaller, animationCallerSelf
stays the same
 2015-05-05 18:53:17 +02:00
PabstMirror
76f540409f Fix 1.44 Updating Base Class 
Updating base class VestItem->ItemInfo, by
z\addons\ace\protection\config.cpp/CfgWeapons/V_PlateCarrierIAGL_dgtl/ItemInfo/
 2015-05-05 10:46:56 -05:00
Nicolás Badano
83304a0622 Merge pull request #1011 from acemod/moveContourLegend 
#940 - Map Tweak (contor legend) for brefing
 2015-05-05 08:14:34 -03:00
ulteq
19864d5be6 Fixed a bug in the humidity calculation 2015-05-05 10:37:51 +02:00
ulteq
4f44bcdf46 Added wind data for Chernarus (Prag) 2015-05-05 10:36:12 +02:00
bux578
bd69405cf4 fix czech typo in medical, fix #1010 2015-05-05 08:37:41 +02:00
PabstMirror
dafff4e63e #940 - Map Tweak (contor legend) for brefing 2015-05-04 23:50:03 -05:00
PabstMirror
21552caee7 Opps- Not the same as javelin 2015-05-04 23:01:19 -05:00
PabstMirror
3fa218848d MissleGuidance - fix Inheritance check 2015-05-04 22:46:58 -05:00
ulteq
f81e53bb33 Added wind data for Takistan (Kabul) 2015-05-04 22:17:26 +02:00
ulteq
be7391bf47 Added wind data for F.A.T.A 2015-05-04 21:28:12 +02:00
ulteq
76eaa5ded1 Added wind data for Bornholm 2015-05-04 20:35:39 +02:00
ViperMaul
032424b23e Merge pull request #1006 from acemod/skipLOSCheckBodyparts 
Interact menu: Increase the minimum distance required for LOS checks to 1.5m
 2015-05-04 10:14:59 -07:00
esteldunedain
d07b69aca4 Increase the minimum distance required to perform LOS checks to 1.5m; should avoid LOS checks for medical bodyparts entirely, thus avoiding problems with weaponholders obstructing actions. 2015-05-04 13:37:14 -03:00
ulteq
d78be0fa23 Merge pull request #998 from Bla1337/master 
Translation fixes/improvements (RU)
 2015-05-04 10:28:35 +02:00
Bla1337
6c6cb9128a Reverted the abbreviation changes 
Abbreviation only used when necessary for the text clipping prevention.
 2015-05-04 09:54:54 +03:00
Glowbal
f6e815fbaf Merge pull request #1003 from acemod/fixMedicalLitterError 
Fix treatment script error
 2015-05-04 00:25:46 +02:00
Glowbal
ae47c78552 Make treatment execute before createLitter 2015-05-04 00:20:28 +02:00
Glowbal
b86012a6b1 Ensure that litterCondition is always code #1000 2015-05-04 00:16:12 +02:00
ulteq
061b77e375 Fixed completely fucked up temperature day/night cycle 2015-05-03 23:32:53 +02:00
ulteq
30c27bf689 Added weather data for kunduz map 2015-05-03 23:21:56 +02:00
ulteq
3fda9e7e7b Merge pull request #997 from ProfessorCZ/master 
Czech translation - Update
 2015-05-03 17:03:47 +02:00
Bla1337
bf592ce0a9 nightvision edits 2015-05-03 17:35:58 +03:00
Bla1337
73d0be88fb nametags edits 2015-05-03 14:57:59 +03:00
Bla1337
a7d66b59cf transaltions 2015-05-03 14:01:35 +03:00
Lukas
3434964f4f Update stringtable.xml 2015-05-03 11:54:18 +02:00
Lukas
da309e6682 Update stringtable.xml 2015-05-03 11:53:12 +02:00
ProfessorCZ
a0e443cfc6 Czech translation - Update 2015-05-03 11:48:56 +02:00
ulteq
4d4604da28 Fixed two typos in the ATragMX gun profile list 2015-05-03 10:47:49 +02:00
ulteq
d653aa262a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ballisticsTranslationFix 
Conflicts:
	addons/ballistics/stringtable.xml
 2015-05-03 10:21:57 +02:00
KoffeinFlummi
f678fb8fbf Merge branch 'spanish-merge' 2015-05-03 02:40:56 +02:00
KoffeinFlummi
7633f406ae Merge branch 'patch-2' of https://github.com/Dimaslg/ACE3 into spanish-merge 
Conflicts:
	addons/laser/stringtable.xml
 2015-05-03 02:40:44 +02:00
PabstMirror
d0975b4c0f Laserpointer Stringtable - fix swapped eng/czk 2015-05-02 18:55:23 -05:00
KoffeinFlummi
697656da92 Merge branch 'master' of https://github.com/acemod/ACE3 2015-05-03 01:08:39 +02:00
KoffeinFlummi
a1d2bd62a4 Merge branch 'patch-1' of https://github.com/FreeZbe/ACE3 into french-merge 
Conflicts:
	addons/interaction/stringtable.xml
 2015-05-03 01:08:22 +02:00
jaynus
27c66ba631 Merge pull request #993 from acemod/clipboardExtension 
ACE clipboard extension to bypass clipboard limit of arma. Close #991
 2015-05-02 15:29:18 -07:00
jaynus
717d7c874f Data chunking. Feature complete. 2015-05-02 15:28:40 -07:00
KoffeinFlummi
e918e1d661 Merge https://github.com/ruPaladin/ACE3 into russian-merge 
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-02 23:43:33 +02:00
KoffeinFlummi
d0c7fce7f3 Merge https://github.com/adam3adam/ACE3 into czech-merge 
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
 2015-05-02 23:29:45 +02:00
esteldunedain
8d92d9cc7d Add ace_clipboard to ACE_Extensions 2015-05-02 18:25:35 -03:00
KoffeinFlummi
298e1d88bd Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-02 23:17:39 +02:00
commy2
f44aaee7c7 also in cursor mode 2015-05-02 23:02:40 +02:00
commy2
0fd783082d don't close menu when no action is selected 2015-05-02 22:53:23 +02:00
esteldunedain
233ca37219 Export settings to clipboard using ace_clipboard. Deprecate exporting through diag_log 2015-05-02 17:52:37 -03:00
ulteq
e6187adfc7 Removed a trailing space 2015-05-02 22:09:38 +02:00
ulteq
b5ec13b992 Fixed some inconsistencies in the stringtable 2015-05-02 22:07:25 +02:00
Felix Wiegand
7678919e8d Merge pull request #982 from ToasterBR/master 
Translation to Portuguese
 2015-05-02 21:40:14 +02:00
Harakhti
6c2717be7f More more translations 
Stope.
 2015-05-02 18:06:01 +02:00
jaynus
980be9f55b Merge pull request #972 from acemod/javFixInheritanceCheck 
Javelin - Fix configProperties
 2015-05-02 08:50:18 -07:00
adam3adam
05a6389acd Czech translation v2 
mk6mortar and some medical translation
 2015-05-02 12:46:28 +02:00
ruPaladin
219735611f interaction2 2015-05-02 12:47:06 +03:00
ruPaladin
3aad0904cd medical2 2015-05-02 12:45:27 +03:00
ruPaladin
3b6e491f5c interaction 2015-05-02 12:42:44 +03:00
ruPaladin
ca03637a54 medical 2015-05-02 12:42:02 +03:00
FreeZbe
66f39fc1dc French : update / fix stringtable 2015-05-02 10:12:28 +02:00
ToasterBR
021b00c722 Translation to Portuguese 
Done all remaining portuguese translations, including some minor
corrections
 2015-05-02 03:38:53 -03:00
PabstMirror
436e50411a Medical - Fix Uncon PFEH argument changes 2015-05-01 22:42:43 -05:00
Felix Wiegand
4dce2b8841 Merge pull request #978 from licht-im-Norden87/patch-7 
Added german strings to interaction
 2015-05-02 04:08:37 +02:00
licht-im-Norden87
f93ac12807 Added german strings to laser 2015-05-02 03:28:54 +02:00
licht-im-Norden87
106f2ab89b Added german strings to interaction 2015-05-02 03:25:28 +02:00
Dimas
b350d234e2 Addes spanish translation 
Added spanish translation for three strings. Did it manually here.
 2015-05-02 02:44:39 +02:00
esteldunedain
b8d8aeae5c Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-05-01 20:32:51 -03:00
esteldunedain
be07fd2c82 Avoid ACE_Comanche_Test from showing on Zeus. #943 2015-05-01 20:32:20 -03:00
Grzegorz
c9cf1d2455 Update CfgVehicles.hpp 
another typo few lines below
 2015-05-02 01:26:54 +02:00
Grzegorz
5b9e6de6f1 Update CfgVehicles.hpp 
missing "s"
 2015-05-02 01:21:49 +02:00
PabstMirror
ce1255bb2f Fix configProperties 2015-05-01 17:56:04 -05:00
KoffeinFlummi
97a9bffe98 Set version number to 3.0.0.2 2015-05-02 00:49:43 +02:00
ulteq
4239772ce9 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-05-02 00:36:34 +02:00
ulteq
884da7742e Disabled AB terrain init, if AB is not enabled 2015-05-02 00:36:23 +02:00
Felix Wiegand
07ec7b96c4 Merge pull request #954 from acemod/medicalFixVehAnimation 
Medical fix veh animation
 2015-05-02 00:35:13 +02:00
KoffeinFlummi
f1ba0cff26 Merge https://github.com/ProfessorCZ/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/advanced_ballistics/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-02 00:26:25 +02:00
KoffeinFlummi
e05f1b557a Merge branch 'master' of https://github.com/acemod/ACE3 2015-05-02 00:19:39 +02:00
KoffeinFlummi
debfe990e8 Fix duplicates 2015-05-02 00:19:10 +02:00
KoffeinFlummi
13b99ed53f Merge https://github.com/adam3adam/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/interact_menu/stringtable.xml
 2015-05-02 00:17:01 +02:00
Lukas
1d3f5cc312 Czceh translation 2015-05-02 00:04:50 +02:00
Felix Wiegand
f16e02b003 Merge pull request #959 from licht-im-Norden87/patch-6 
Update Stringtable: missileguidance
 2015-05-02 00:03:13 +02:00
Grzegorz
c1d87f2a75 PL translation 
interaction
 2015-05-01 23:50:27 +02:00
Felix Wiegand
a211bcfacf Merge pull request #689 from acemod/group 
Reword the group action names
 2015-05-01 23:30:10 +02:00
Tachii
60c02f4051 added 2 missing ru strings 2015-05-02 00:21:00 +03:00
FreeZbe
6f5e64b4a5 French : update / fix stringtable 2015-05-01 23:10:06 +02:00
FreeZbe
7e12c97317 French : update / fix stringtable 2015-05-01 23:09:09 +02:00
FreeZbe
d1da3a82d7 French : update / fix stringtable 2015-05-01 23:08:36 +02:00
Felix Wiegand
58a67a2f77 Merge pull request #962 from gienkov/patch-10 
PL translation
 2015-05-01 22:51:36 +02:00
KoffeinFlummi
cc627b4a92 Merge branch 'master' of https://github.com/acemod/ACE3 2015-05-01 22:50:11 +02:00
Dimaslg
339cd8febd Add spanish translation for removing tournis 2015-05-01 22:49:52 +02:00
Glowbal
937b20f551 Merge branch 'master' of github.com:acemod/ACE3 2015-05-01 22:49:24 +02:00
Glowbal
09a0158fa4 This should not be 1 2015-05-01 22:49:13 +02:00
Grzegorz
3b321c7bf2 PL translation 
laser
 2015-05-01 22:46:51 +02:00
KoffeinFlummi
a002c796da Merge branch 'patch-9' of https://github.com/gienkov/ACE3 into polish-merge 
Conflicts:
	addons/medical/stringtable.xml
 2015-05-01 22:46:49 +02:00
KoffeinFlummi
d8299332e4 Merge branch 'master' of https://github.com/acemod/ACE3 
Conflicts:
	addons/respawn/stringtable.xml
 2015-05-01 22:44:42 +02:00
KoffeinFlummi
fb807cbb86 Merge branch 'master' into spanish-merge 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-01 22:44:10 +02:00
Dimaslg
6f2caec6ec Last touches to Spanish translation 2015-05-01 22:42:09 +02:00
bux578
1a946acc30 German Translation / Typo 2015-05-01 22:33:26 +02:00
Grzegorz
8828704e76 PL translation 
STR_ACE_Medical_RemovingTourniquet
 2015-05-01 22:32:53 +02:00
Glowbal
0a300f3385 Merge pull request #960 from acemod/medicalMissingProgressText 
Added missing progress bar display text
 2015-05-01 22:31:41 +02:00
Glowbal
e8ccddfc2c Added missing progress bar display text 2015-05-01 22:29:52 +02:00
adam3adam
f5303d455c Translation of some stuff into czech language 
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
 2015-05-01 22:23:03 +02:00
PabstMirror
bded34fa23 I suck at git 
redo reverted stuff here
 2015-05-01 15:03:05 -05:00
licht-im-Norden87
5e8096f29c Update Stringtable: missileguidance 2015-05-01 21:29:49 +02:00
PabstMirror
e67e15c3fa Merge branch 'master' into medicalFixVehAnimation 
Conflicts:
	addons/common/functions/fnc_getDeathAnim.sqf
	addons/common/functions/fnc_loadPersonLocal.sqf
 2015-05-01 14:29:21 -05:00
licht-im-Norden87
d12c7ff048 Update Stringtable: Rallypoint 
Angleichung
 2015-05-01 21:25:39 +02:00
KoffeinFlummi
c9ff497c83 Merge branch 'master' into polish-merge 
Conflicts:
	addons/respawn/stringtable.xml
 2015-05-01 21:13:36 +02:00
Felix Wiegand
90275b272e Merge pull request #950 from Tachii/patch-19 
Added few missing ru strings
 2015-05-01 21:11:37 +02:00
Felix Wiegand
b0094ff8e6 Merge pull request #949 from Tachii/patch-18 
added 1 RU string
 2015-05-01 21:11:17 +02:00
Felix Wiegand
3d45a26334 Merge pull request #957 from evromalarkey/master 
Few Czech strings
 2015-05-01 21:07:27 +02:00
jaynus
2bd0acb621 Revert "GetDeathAnim" 
This reverts commit 0f736ae684.
 2015-05-01 12:00:38 -07:00
jaynus
6603806c77 Revert "Save and replay valid awake animations" 
This reverts commit 8d1ac26e24.
 2015-05-01 12:00:21 -07:00
jaynus
c1ba4966f9 Test confirm no bouncy. 2015-05-01 11:53:55 -07:00
Lubomír Blažek
dcb3196e58 Czech strings 2015-05-01 20:52:41 +02:00
jaynus
5bf763a08e quote, not var. 2015-05-01 11:47:49 -07:00
Tachii
bed298d5b3 Update stringtable.xml 2015-05-01 21:38:05 +03:00
jaynus
2ed05ed469 Merge remote-tracking branch 'origin/master' into laserCodeSelection 2015-05-01 11:35:11 -07:00
jaynus
dcf4f3b53e Resolved. Conflicts: 
addons/missileguidance/functions/fnc_onFired.sqf
 2015-05-01 11:35:03 -07:00
jaynus
dfbfb4ace2 Laser code selection, hotkeys and locking. Turrets & designator, and gunner. Closes #751 2015-05-01 11:31:37 -07:00
Glowbal
e1d0ac4b9e Added author 2015-05-01 20:16:34 +02:00
PabstMirror
d8a6dd1bbd Stuff 2015-05-01 12:58:56 -05:00
Tachii
66eda924ac Update stringtable.xml 2015-05-01 20:48:37 +03:00
Glowbal
722c459c1e added APL pbo 2015-05-01 19:37:17 +02:00
Grzegorz
7e87c3a250 Update stringtable.xml 2015-05-01 19:32:59 +02:00
Grzegorz
e36fbe9da7 Update stringtable.xml 2015-05-01 19:32:43 +02:00
Grzegorz Sikora
4668869959 PL translation 2015-05-01 19:30:30 +02:00
Tachii
b1a23fd3c7 Update stringtable.xml 2015-05-01 20:29:57 +03:00
Tachii
43dea56ae6 Update stringtable.xml 2015-05-01 20:29:00 +03:00
Tachii
66818e0a74 Update stringtable.xml 2015-05-01 20:26:05 +03:00
Tachii
889275091e Update stringtable.xml 2015-05-01 20:24:13 +03:00
Tachii
1771b61578 added 2 missing ru strings 2015-05-01 20:23:05 +03:00
Tachii
43655d0cec Update stringtable.xml 2015-05-01 20:18:51 +03:00
Tachii
caf301ac99 Update stringtable.xml 
Added 1 RU string
 2015-05-01 20:15:35 +03:00
PabstMirror
8d1ac26e24 Save and replay valid awake animations 2015-05-01 12:12:13 -05:00
ulteq
ff2d7fdb72 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fcsInitSpeedFix 
Conflicts:
	addons/fcs/functions/fnc_firedEH.sqf
 2015-05-01 19:00:27 +02:00
ulteq
aa21962f8b Allowed positive weapon initSpeed values 2015-05-01 18:55:44 +02:00
Glowbal
80162627ec Fixed spelling of enableUnconsciousnessAI 2015-05-01 18:49:59 +02:00
Felix Wiegand
23bb96e514 Merge pull request #948 from ruPaladin/patch-7 
Russian translation (interact_menu)
 2015-05-01 18:39:34 +02:00
ruPaladin
2aa788bba2 Update stringtable.xml 2015-05-01 19:26:23 +03:00
ruPaladin
a883517a5e Update stringtable.xml 2015-05-01 19:18:06 +03:00
KoffeinFlummi
30e90a377e Fix duplicate entries 2015-05-01 17:51:31 +02:00
KoffeinFlummi
48e59f0d71 Merge branch 'master' of https://github.com/acemod/ACE3 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:46:58 +02:00
KoffeinFlummi
1e786d4a92 Merge https://github.com/FreeZbe/ACE3 into french-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:45:00 +02:00
ulteq
a42dec6760 Added more missing privates 2015-05-01 17:40:30 +02:00
ulteq
5dcb45bd33 Finds the corresponding weapon class for each magazine type. 2015-05-01 17:39:38 +02:00
KoffeinFlummi
e46eba673f Merge branch 'master' into german-translation 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:36:40 +02:00
KoffeinFlummi
954e4ef549 Merge branch 'master' of https://github.com/acemod/ACE3 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:32:19 +02:00