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
3,119 Commits 73 Branches 88 Tags 752 MiB
6d18e484c1
Commit Graph

2800 Commits

Author SHA1 Message Date
Tachii
2466d83cac Update stringtable.xml 2015-04-16 18:19:11 +03:00
Tachii
def2f9c28e Update stringtable.xml 2015-04-16 18:13:53 +03:00
Tachii
dca11e523b Update stringtable.xml 2015-04-16 18:08:58 +03:00
Nicolás Badano
8cb167d1be Merge pull request #663 from ruPaladin/patch-1 
addons/realisticnames translation to Russian
 2015-04-16 10:06:12 -03:00
Coren4
4ff68eabd4 Update stringtable.xml 2015-04-16 14:59:19 +02:00
ulteq
55d9f7a3da The previous GUI state is now restored when you open the ATragMX 2015-04-16 13:46:32 +02:00
ulteq
d6cadb593a Enabled the ATragMX to use the advanced ballistics extension 2015-04-16 13:44:54 +02:00
ulteq
ca3293aa1a Added ACE_Box_Ammo (WIP): 
*TODO: Define a model
 2015-04-16 13:43:41 +02:00
ulteq
15240ac87c Minor code change in the extension detection logic 2015-04-16 13:42:28 +02:00
ruPaladin
e00dd1c2f2 addons/realisticnames translation to Russian 2015-04-16 14:10:48 +03:00
ulteq
aa724129d1 Tuned down the default timeToLive value. 2015-04-16 10:51:33 +02:00
Marco
00c0839ce5 Update stringtable.xml 
IT
 2015-04-16 10:33:15 +02:00
Marco
ba510facbd Update stringtable.xml 
IT
 2015-04-16 10:29:17 +02:00
Marco
23cb1058fc Update stringtable.xml 
IT
 2015-04-16 10:26:55 +02:00
Marco
500098d061 Update stringtable.xml 
IT
 2015-04-16 10:25:39 +02:00
Marco
66ba74e79d Update stringtable.xml 
IT
 2015-04-16 10:24:17 +02:00
Marco
13de953aab Update stringtable.xml 
IT
 2015-04-16 10:23:34 +02:00
Marco
0655c3f3b6 Update stringtable.xml 
IT
 2015-04-16 10:22:32 +02:00
Marco
fda1febc30 Update stringtable.xml 
IT
 2015-04-16 10:21:49 +02:00
Marco
59643152bd Update stringtable.xml 
IT
 2015-04-16 10:19:43 +02:00
Marco
5e7fb0fb64 Update stringtable.xml 
IT
 2015-04-16 10:18:49 +02:00
Marco
c1655aa9a9 Update stringtable.xml 
IT
 2015-04-16 10:16:17 +02:00
Marco
b3d4e2f48f Update stringtable.xml 
IT
 2015-04-16 10:14:18 +02:00
Marco
a129f18a2a Update stringtable.xml 
Italian
 2015-04-16 10:13:50 +02:00
PabstMirror
9c9136ae91 Stringtable cleanup 2015-04-16 02:54:50 -05:00
PabstMirror
58dfc6aa97 Add item to ace misc box 2015-04-15 22:34:24 -05:00
PabstMirror
80516f4f61 Increase Sound Volume 2015-04-15 22:27:12 -05:00
PabstMirror
b2625c43e7 #644 - Extra Space in macro 2015-04-15 20:30:09 -05:00
commy2
8d8ae3dadb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 02:00:55 +02:00
commy2
4169351b1a fix addActionEH didn't work after respawn 2015-04-16 02:00:37 +02:00
PabstMirror
23f47f97ae Wirecutter - better sound effects, cleanup 2015-04-15 18:32:47 -05:00
Glowbal
59ae4623ff Derp 2015-04-16 00:17:17 +02:00
Glowbal
f3ca1a85b9 Merge branch 'master' of github.com:acemod/ACE3 2015-04-16 00:15:57 +02:00
Glowbal
0f4b7d0977 fixes #347 
Please??
 2015-04-16 00:14:05 +02:00
PabstMirror
0076be6a86 Fix stringtables 2015-04-15 17:08:35 -05:00
PabstMirror
c0c5af2957 ballistics - fix ubc 2015-04-15 17:07:06 -05:00
PabstMirror
361efe4147 Missing NoVoice words 
Protocol bin\config.bin/ACE_RadioProtocolNoRadio/: Missing word RallyUp
/ UnderFireE
 2015-04-15 17:04:03 -05:00
Tachii
dd09cc4d06 Update fnc_createAction.sqf 
typo
 2015-04-16 00:57:15 +03:00
ulteq
0b7ceea64e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 22:50:19 +02:00
ulteq
25e1fd2df3 Completely overworked the ATragMX gun list 2015-04-15 22:50:04 +02:00
ulteq
60c54733cc Polished the ammo classes some more 2015-04-15 22:49:47 +02:00
KoffeinFlummi
8aeeff616e Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-15 22:21:21 +02:00
KoffeinFlummi
1b67b2df26 Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge 
Conflicts:
	addons/disposable/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/markers/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
 2015-04-15 22:20:47 +02:00
commy2
fb3ba51fe5 port alternative wirecutter sound 2015-04-15 22:19:43 +02:00
commy2
6f6d080dbd port inject sound 2015-04-15 22:16:54 +02: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
KoffeinFlummi
9e6ae52ca5 Merge branch 'patch-6' of https://github.com/ramius86/ACE3 into italian-merge 
Conflicts:
	addons/captives/stringtable.xml
 2015-04-15 22:07:42 +02:00
KoffeinFlummi
5c3b06b1bf Merge branch 'patch-1' of https://github.com/ramius86/ACE3 into italian-merge 
Conflicts:
	addons/medical/stringtable.xml
 2015-04-15 22:06:18 +02:00
KoffeinFlummi
234e8e5c40 Merge branch 'patch-1' of https://github.com/Clon1998/ACE3 into german-merge 
Conflicts:
	addons/interaction/stringtable.xml
 2015-04-15 21:55:52 +02:00
jaynus
ea3475d388 Merge pull request #631 from FreeZbe/patch-9 
French : update / fix stringtable
 2015-04-15 12:31:03 -07:00
jaynus
9c4e217822 Merge pull request #633 from FreeZbe/patch-10 
French : update stringtable
 2015-04-15 12:29:56 -07:00
jaynus
185f9379fd Merge pull request #639 from FreeZbe/patch-16 
French : update stringtable
 2015-04-15 12:29:37 -07:00
jaynus
ddaf05262e Merge pull request #638 from FreeZbe/patch-15 
French : update stringtable
 2015-04-15 12:29:02 -07:00
jaynus
0a3a650437 Merge pull request #634 from FreeZbe/patch-11 
French : update stringtable
 2015-04-15 12:28:26 -07:00
FreeZbe
5a7ad82170 French : update stringtable 2015-04-15 21:26:12 +02:00
jaynus
2d189e6199 Merge branch 'master' of github.com:acemod/ACE3 2015-04-15 12:26:03 -07:00
jaynus
10cf02e856 Slower climb phase.Refs #630 2015-04-15 12:25:57 -07:00
FreeZbe
18c65108c3 French : update stringtable 2015-04-15 21:24:24 +02:00
Nicolás Badano
3e205a70d8 Merge pull request #636 from FreeZbe/patch-13 
French : update stringtable
 2015-04-15 16:18:58 -03:00
Nicolás Badano
e6cc26cc96 Merge pull request #635 from FreeZbe/patch-12 
French : update stringtable
 2015-04-15 16:18:39 -03:00
Nicolás Badano
1678a6d695 Merge pull request #628 from ruPaladin/master 
Russian translation fixes
 2015-04-15 16:17:59 -03:00
FreeZbe
56f6c60e1a French : update stringtable 2015-04-15 21:17:35 +02:00
FreeZbe
df61f5c995 French : update stringtable 2015-04-15 21:15:57 +02:00
FreeZbe
c0dbf10971 French : update stringtable 2015-04-15 21:14:00 +02:00
jaynus
5bcb0ec493 Forgot to set terminal on short-range attacks. Fixes #630 2015-04-15 12:09:47 -07:00
commy2
f40373bb78 Merge pull request #550 from acemod/rallypointfix 
fix rallypoints being broken, fix #522
 2015-04-15 21:03:13 +02:00
FreeZbe
550c32e801 French : update stringtable 2015-04-15 20:53:41 +02:00
commy2
d68cc8f40e sync rallypoint marker on jip 2015-04-15 20:50:03 +02:00
ulteq
3ca37baf44 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 20:33:19 +02:00
ulteq
3a062a4ff9 Fixed incorrect Mk319 Mod 0 BC/airFriction 2015-04-15 20:33:11 +02:00
FreeZbe
bc5b9bdfe9 French : update / fix strintable 2015-04-15 20:11:08 +02:00
PabstMirror
e54d8dc827 ProgressBar - Fixed Alignment 2015-04-15 12:55:20 -05:00
PabstMirror
134f48ba55 Merge pull request #602 from acemod/nametagsIsSpeakingPerf 
Nametags - isSpeaking reduce network traffic
 2015-04-15 12:55:15 -05:00
ulteq
d9b3255e21 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 19:51:40 +02:00
ulteq
3cff85e85d Added Mk319 Mod 0 ammo and magazines 2015-04-15 19:51:34 +02:00
Glowbal
c88479d54d staged work 2015-04-15 19:45:42 +02:00
commy2
18be5276a9 rally point moved eh, markers at rallypoint positions 2015-04-15 19:18:42 +02:00
jaynus
743a6d82a5 Merge branch 'master' of github.com:acemod/ACE3 2015-04-15 10:11:18 -07:00
jaynus
25b7f779f1 Difficulty magic. 2015-04-15 10:11:13 -07:00
ruPaladin
26d53d255f Update stringtable.xml 2015-04-15 20:08:39 +03:00
ulteq
396bd3954e Fixed a typo 2015-04-15 19:04:41 +02:00
ruPaladin
fe72eef3da Update stringtable.xml 2015-04-15 20:02:41 +03:00
ulteq
b5a82e313e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 19:00:24 +02:00
ulteq
0c4734637b Fixed the GM6 barrel length and updated the magazines array 2015-04-15 19:00:14 +02:00
ruPaladin
92031cc354 Update stringtable.xml 2015-04-15 19:59:45 +03:00
ulteq
f8061922f7 Added ACE_10Rnd_338_API526_Mag, ACE_5Rnd_127x99_Mag, ACE_5Rnd_127x99_AMAX_Mag 2015-04-15 18:59:41 +02:00
ulteq
e0c34f22bf Added ACE_338_Ball_API526 and updated some airFriction values 2015-04-15 18:59:11 +02:00
ruPaladin
3773238e25 Update stringtable.xml 2015-04-15 19:56:34 +03:00
jaynus
2e3545f3d0 Merge branch 'master' of github.com:acemod/ACE3 2015-04-15 09:55:48 -07:00
jaynus
ea2281616e Enable all variants of Titan. Can now vanilla-lock in cadet mode. 2015-04-15 09:55:40 -07:00
ulteq
64d6bbaf26 Fixed an incorrect BC in an ATragMX gun profile 2015-04-15 18:55:20 +02:00
ruPaladin
7051152d93 Update stringtable.xml 2015-04-15 19:53:42 +03:00
ruPaladin
d8eb564c65 Update stringtable.xml 2015-04-15 19:52:29 +03:00
ruPaladin
252fb67119 Update stringtable.xml 2015-04-15 19:50:32 +03:00
PabstMirror
e84689a771 #544 - Change ERROR warning to debug trace 2015-04-15 11:46:06 -05:00
PabstMirror
6ea38a9946 Only check A3 VON if no radio mods running 2015-04-15 11:34:27 -05:00
Nicolás Badano
fecb2f37c0 Merge pull request #621 from ruPaladin/patch-5 
Kestrel 4500NV translation to Russian
 2015-04-15 13:28:44 -03:00
Nicolás Badano
0a6604a94f Merge pull request #622 from ruPaladin/patch-6 
addons/interact_menu translation to Russian
 2015-04-15 13:28:33 -03:00
jaynus
a5700540bb Merge pull request #623 from ruPaladin/patch-7 
addons/weather/ translation to Russian
 2015-04-15 09:28:04 -07:00
Nicolás Badano
7589b8b13d Merge pull request #626 from ruPaladin/patch-11 
addons/medical translation to Russian
 2015-04-15 13:27:22 -03:00