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
2,301 Commits 73 Branches 88 Tags 752 MiB
018854a7c3
Commit Graph

2301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commy2
018854a7c3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into muteunit 2015-04-12 09:15:45 +02:00
PabstMirror
78b64ea273 Missing English 2015-04-12 01:36:41 -05:00
bux578
2fc7f44c39 french translation, tabler 4 spaces test 2015-04-12 07:50:23 +02:00
bux578
0e3d971274 Fix translations error 2015-04-12 07:46:43 +02:00
Felix Wiegand
0efcd7d56f Merge pull request #499 from gienkov/patch-2 
AUTHORS.TXT / e-mail of me and ACCtomeek
 2015-04-12 04:23:59 +02:00
KoffeinFlummi
fa00052c66 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-12 06:22:56 +02:00
KoffeinFlummi
59952441d8 Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-12 06:22:17 +02:00
KoffeinFlummi
362753209e Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-12 05:40:24 +02:00
KoffeinFlummi
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00
KoffeinFlummi
5108137302 Merge https://github.com/Ricciardino/ACE3 into italian-merge 2015-04-12 04:38:46 +02:00
KoffeinFlummi
5101a21beb Remove "Original" stringtable entries 2015-04-12 04:21:06 +02:00
Felix Wiegand
4d1e21d362 Merge pull request #500 from licht-im-Norden87/patch-4 
Update AUTHORS.txt
 2015-04-12 03:41:18 +02:00
licht-im-Norden87
a30eabfb1d Update stringtable.xml 2015-04-12 03:30:11 +02:00
licht-im-Norden87
bd673d3374 Update stringtable.xml 2015-04-12 03:28:12 +02:00
licht-im-Norden87
bd07e18b43 Update stringtable.xml 2015-04-12 03:26:45 +02:00
licht-im-Norden87
200c380622 Update AUTHORS.txt 2015-04-12 03:16:42 +02:00
Grzegorz
2182e8b631 e-mail of me and ACCtomeek 2015-04-12 03:15:57 +02:00
PabstMirror
350a79c8a4 #498 - Use cursor mode when scoped 2015-04-11 19:44:42 -05:00
Felix Wiegand
0531f2cc12 Merge pull request #493 from FreeZbe/patch-7 
Update stringtable.xml
 2015-04-12 01:14:40 +02:00
Felix Wiegand
7d8ad37ae0 Merge pull request #495 from FreeZbe/patch-8 
Update AUTHORS.txt
 2015-04-12 01:14:34 +02:00
esteldunedain
a01864319a Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-11 19:34:53 -03:00
esteldunedain
488000bdf3 Rename "Check Temperature" to "Check Weapon Temperature" and move it inside the equipment submenu. Close #494 2015-04-11 19:34:29 -03:00
FreeZbe
2ccec59b80 Update AUTHORS.txt 2015-04-12 00:14:33 +02:00
PabstMirror
baf4b0146e Missing semmicolon 2015-04-11 16:50:35 -05:00
PabstMirror
0805d5b640 Update UAV battery icon from AGM 2015-04-11 16:48:49 -05:00
FreeZbe
3ff6abde71 Update stringtable.xml 2015-04-11 23:18:51 +02:00
jaynus
1a9b25c70e Merge pull request #492 from acemod/acreCompat 
ACRE API functions and core functions were incorrect.
 2015-04-11 14:14:04 -07:00
jaynus
2a2f96a034 ACRE API functions and core functions were incorrect. 2015-04-11 14:10:30 -07:00
EpMAK
8406031a6e Update AUTHORS.txt 2015-04-12 00:03:45 +03:00
jaynus
ffb7c0fbaa Merge pull request #488 from acemod/javelinLocking 
Javelin locking and CLU interface
 2015-04-11 14:02:41 -07:00
jaynus
458c49b0a7 Merge remote-tracking branch 'origin/master' into javelinLocking 
Conflicts:
	addons/common/XEH_preInit.sqf
 2015-04-11 14:01:47 -07:00
jaynus
6e28b3b9b7 Disable gates (reload) 2015-04-11 13:59:17 -07:00
jaynus
d744074b2f localization. 2015-04-11 13:48:46 -07:00
jaynus
2418d99f97 Finalizes port. Closes #75 2015-04-11 13:41:00 -07:00
jaynus
75216c2f8b readme, authors. 2015-04-11 13:39:16 -07:00
jaynus
2999ff55e1 Working javelin targeting and gating. Still has red center target optic because I cant do optic p3d's. TODO: We need an optic p3d. 2015-04-11 13:37:55 -07:00
jaynus
505005891d Remove debug, targeting constraints working. 2015-04-11 12:42:30 -07:00
PabstMirror
f5cce94b91 Merge pull request #136 from acemod/disarmingTest 
Unit Disarming/DropGear Merge
 2015-04-11 14:14:22 -05:00
EpMAK
21abff3713 Revert "Revert "Russian Translation"" 
This reverts commit ea04f4ab3e.
 2015-04-11 21:33:34 +03:00
EpMAK
ea04f4ab3e Revert "Russian Translation" 
This reverts commit 17a552bb80.
 2015-04-11 21:33:07 +03:00
commy2
b9077888aa unmute handleing 2015-04-11 20:26:43 +02:00
jaynus
458958ef09 Target gating implemented. 2015-04-11 11:17:34 -07:00
jaynus
aa53a1815c scaling. 2015-04-11 10:58:27 -07:00
jaynus
fb6c99d69b re-path. Wtf safezones. 2015-04-11 10:56:58 -07:00
jaynus
efaee770bb rename wep_javelin to javelin 2015-04-11 10:44:13 -07:00
Felix Wiegand
0bf32bfb3a Merge pull request #476 from acemod/dropbackpack 
function to drop backpack
 2015-04-11 18:23:27 +02:00
commy2
e1bf475355 Merge pull request #419 from acemod/cfgtriggers 
rename cfgAce_Triggers to ACE_Triggers
 2015-04-11 18:19:36 +02:00
commy2
4dc38ca7ee Merge pull request #395 from acemod/flashsup 
flashsupressors for new weapons, #264
 2015-04-11 18:18:05 +02:00
commy2
761e4aec64 edit description 2015-04-11 16:27:04 +02:00
esteldunedain
dec5aa3ec5 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-11 11:12:56 -03:00