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,469 Commits 73 Branches 88 Tags 752 MiB
6d92a0fe88
Commit Graph

3091 Commits

Author SHA1 Message Date
Tachii
b7c7d2ff15 Update stringtable.xml 2015-04-18 03:04:14 +03:00
commy2
708a2aa374 check if ddls are present on mission start 2015-04-18 01:44:53 +02:00
Tachii
04858bb673 Update stringtable.xml 2015-04-18 02:19:09 +03:00
PabstMirror
ed2e847247 More Privates 2015-04-17 18:13:09 -05:00
Tachii
7f942a06f8 Update stringtable.xml 2015-04-18 02:11:16 +03:00
Tachii
0bb3238db1 Update stringtable.xml 2015-04-18 02:09:59 +03:00
Tachii
bd3ef35c88 Update stringtable.xml 2015-04-18 02:07:49 +03:00
commy2
ad287d3d23 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into error 2015-04-18 01:05:42 +02:00
commy2
3ec5acbdb0 stuff 2015-04-18 01:05:30 +02:00
Tachii
1e446fb060 Update stringtable.xml 2015-04-18 02:01:09 +03:00
ulteq
b32a2b7495 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 00:12:04 +02:00
ulteq
314b0d23d6 ATragMX Feature Expansion: 
*Added Gun and Ammo Data Screen
*Added Atomospheric and Environmental Data Screen
*Added Target Data Screen
*Added support for coriolis- and spin drift
*Added a second option (AT) to enter atmospheric data
*Target data is now saved/restored in/from the profileNamespace
*Atmosphere data is now saved/restored in/from the profileNamespace
*Selected gun profile is now saved/restored in/from the profileNamespace
*Fixed several bugs in the dual-/imperial unit systems
*Minor bug fixes in the target range assist screen
*Minor bug fix in the target speed assist screen
 2015-04-18 00:11:53 +02:00
PabstMirror
dce344c85f Ignore Case 2015-04-17 16:51:27 -05:00
commy2
25d8c6c93e function to show error message box 2015-04-17 23:24:43 +02:00
Glowbal
d1a09ae7fc fixed vehicle crashes for adv 2015-04-17 23:15:41 +02:00
PabstMirror
00f26144ec More Privates 2015-04-17 15:45:00 -05:00
Glowbal
bc4d102d08 changed variable initialization - everything is now done local 2015-04-17 22:43:31 +02:00
Glowbal
cbc3584f9d removed duplicate condition attribute 2015-04-17 22:24:42 +02:00
Glowbal
9670267d20 Fixed wrong classnames for IV treatments 2015-04-17 22:21:54 +02:00
Glowbal
f5effca216 fixed handleDamage basic 2015-04-17 22:21:15 +02:00
Glowbal
6d18e484c1 Cache condition for target instead of caller 2015-04-17 22:02:43 +02:00
Glowbal
0e858be1b1 Changed conditions for body parts are now always true. 
This way the medical information is always available, and should help a bit with performance as well.
 2015-04-17 22:00:07 +02:00
Grzegorz Sikora
7489e514ce PL translation 2015-04-17 21:48:04 +02:00
Glowbal
fa7bb5f9c6 Added unconscious state check 2015-04-17 21:28:47 +02:00
Glowbal
008c36ac76 fixes #699 2015-04-17 21:27:57 +02:00
Glowbal
eb731b1169 fixes #653 2015-04-17 21:07:09 +02:00
Glowbal
31bc09a9a3 fixed AI standing up before being killed 
Doesn't matter if we enable AI again on dead units
 2015-04-17 21:06:30 +02:00
Glowbal
9b4435827e Added setting for unconscious animations on treatment 2015-04-17 20:51:57 +02:00
Glowbal
80139521bc fixes #691 2015-04-17 20:49:24 +02:00
Glowbal
b333e6e662 Keep units longer unconscious, instead of quickly fading in/out 2015-04-17 20:40:24 +02:00
Glowbal
847ee7e229 Moved unconscious event, so it won't conflict in case the unit is still being carried 2015-04-17 20:38:02 +02:00
Glowbal
0234eedd54 Changed, only drop unit is player goes unconscious, otherwise keep carrying/dragging unit 2015-04-17 20:33:13 +02:00
commy2
0e90199e23 remove debug message 2015-04-17 20:29:01 +02:00
Glowbal
8b7e46c45f fixes #656 2015-04-17 20:26:28 +02:00
Glowbal
c86be12668 fixes #599 2015-04-17 20:24:05 +02:00
Glowbal
111a350a84 Merge branch 'master' into advMedicalEventSync 2015-04-17 20:11:53 +02:00
Aleksey Yermakov
8a669c390a Update stringtable.xml 2015-04-17 20:35:34 +03:00
Aleksey Yermakov
2f1ee94d91 Update stringtable.xml 2015-04-17 20:24:32 +03:00
jaynus
2be38c493c ACE JIP synchronized event infastructure. 2015-04-17 10:21:41 -07:00
Aleksey Yermakov
bf7a7b5bc9 Update stringtable.xml 2015-04-17 20:18:41 +03:00
PabstMirror
6e077de829 Medical - Use default value instead of 0 for getVar 
#683 - should prevent people getting knocked out from any damage source
if the variables are undefined
 2015-04-17 12:13:23 -05:00
EpMAK
c88bda487b Merge remote-tracking branch 'upstream/master' 
Conflicts:
	addons/weaponselect/stringtable.xml
 2015-04-17 19:48:01 +03:00
EpMAK
31a2f1b279 Russian translations 
Again, filling strings, fixing errors
 2015-04-17 19:36:07 +03:00
PabstMirror
bb2383cffd #700 - ProgressBar Visual Improvement 2015-04-17 09:51:47 -05:00
ruPaladin
2698490569 medical (patient status semantic fixes) 2015-04-17 17:49:03 +03:00
jaynus
e83ab4049f Fixed: Tabs everywhere. 2015-04-17 07:30:55 -07:00
jaynus
3a94753645 tab 2015-04-17 07:28:59 -07:00
jaynus
6c3e699fdb tabs 2015-04-17 07:28:19 -07:00
jaynus
469dafd0c0 tab 2015-04-17 07:25:49 -07:00
KoffeinFlummi
1d93589ebc Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-17 15:45:22 +02:00
KoffeinFlummi
20e4858a0d Merge https://github.com/ramius86/ACE3 into italian-merge 2015-04-17 15:44:50 +02:00
commy2
f8f2748d28 Merge pull request #646 from acemod/wireCuttersSoundEffect 
Wire cutters sound effect
 2015-04-17 15:40:42 +02:00
commy2
7e275a43f4 Merge pull request #693 from acemod/parafix 
hide height / velocity while parachuting, freefallig in expert mode, fix #692
 2015-04-17 15:40:34 +02:00
commy2
77b057e188 Merge pull request #698 from acemod/dispofix 
disposable cleanup, fix #696
 2015-04-17 15:40:28 +02:00
ruPaladin
874cc75271 medical (semantic correction) 2015-04-17 16:22:02 +03:00
ruPaladin
52dc5d66a4 nametags (fix text overlapping, semantic correct) 2015-04-17 16:09:17 +03:00
ruPaladin
a4980a91e1 inventory (semantic correction) 2015-04-17 16:04:26 +03:00
ruPaladin
a6e0cac734 interact_menu (fixes to prevent text overlapping) 2015-04-17 16:02:46 +03:00
ruPaladin
766321224b hearing 2015-04-17 15:59:29 +03:00
ruPaladin
b80ec3f790 ballistics russian fixes + multilanguage fix 2015-04-17 15:57:25 +03:00
ruPaladin
af876e3370 attach 2015-04-17 15:27:53 +03:00
EpMAK
c2214efeb1 Russian stringtables finished 
Filled all the missing lines, little errors fixed.
 2015-04-17 14:54:28 +03:00
commy2
26944ea84e make altimeter actually usable with parachutes 2015-04-17 13:01:38 +02:00
commy2
73fd9ac62e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into parafix 2015-04-17 12:55:07 +02:00
commy2
558a4fb363 Merge pull request #461 from Tenga/altimeter-fix 
Altimeter fix, division by zero when no time has passed (game paused, etc.)
 2015-04-17 12:49:06 +02:00
commy2
45d639b395 disposable cleanup, fix #696 2015-04-17 12:28:06 +02:00
nomisum
d865e9c038 fixed typo 2015-04-17 11:42:47 +02:00
nomisum
8813315f36 added missing translations german 2015-04-17 11:40:31 +02:00
ulteq
e04a0c438a Fixed deprecated delete_gun function 2015-04-17 11:05:24 +02:00
commy2
20565e8b02 hide height / velocity while parachuting, freefallig in expert mode, fix 692 2015-04-17 11:02:01 +02:00
ruPaladin
e38a6fc62b one more russian fix 2015-04-17 12:01:01 +03:00
esteldunedain
54daa02aa4 Weather: headers + privates 2015-04-17 01:44:38 -03:00
PabstMirror
7d5a70246b Remove unnecessary cfgSounds 2015-04-16 22:10:33 -05:00
esteldunedain
bdd3422150 Allow to dynamically modify actions at runtime. An optional code entry called modifierFunction can be added. That code is called before evaluating the action, allowing to dynamically change the actions name, icon, etc 2015-04-16 23:53:54 -03:00
PabstMirror
1729c781bd Cleanup / private vars 2015-04-16 19:46:42 -05:00
PabstMirror
53af014eab Fix Localization in value[] array 2015-04-16 19:29:39 -05:00
PabstMirror
4e5c2ef187 option menu ui scaling 2015-04-16 19:11:42 -05:00
PabstMirror
e12831bee4 #678 - Missing Text Height in settingMenu 2015-04-16 15:17:56 -05:00
jaynus
ce4a9c3676 Apply javelin guidance to static titans. 2015-04-16 11:32:47 -07:00
ulteq
4ef80ab3a3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 20:14:33 +02:00
PabstMirror
fa6cb3e75c #672 - Don't show speaking icon for unconc players 2015-04-16 12:58:54 -05:00
ulteq
a7507fefef Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 19:55:48 +02:00
ulteq
1794606304 Got rid of the __DSP macro 2015-04-16 19:52:20 +02:00
PabstMirror
638433614c Some missing private defines. 2015-04-16 12:36:16 -05:00
Nicolás Badano
95cab9d0e7 Merge pull request #671 from Legolasindar/master 
added spanish translation
 2015-04-16 14:18:41 -03:00
jaynus
3d7ae5e3a1 Merge branch 'master' of github.com:acemod/ACE3 2015-04-16 10:10:31 -07:00
jaynus
6a942ac820 Fixed: ACE_Fake**** Was showing in arsenal. Fixes #670 2015-04-16 10:10:24 -07:00
jaynus
8837355d29 Merge remote-tracking branch 'origin/master' into guidanceHandoff 2015-04-16 10:04:57 -07:00
Ivan Navarro Cabello
61d1e6854e added spanish translation 
added spanish translation to ballistics and respawn
 2015-04-16 19:03:15 +02:00
ulteq
668888de81 Fixed constant name not following the coding-guideline 2015-04-16 19:00:37 +02:00
ulteq
aeffc55859 Added missing privates 2015-04-16 18:52:48 +02:00
jaynus
bce4f14cc8 Merge remote-tracking branch 'origin/laserCodes' into guidanceHandoff 2015-04-16 09:40:47 -07:00
jaynus
6d93fe45a6 Guidance handoff to guiding unit/laser shooter. This needs LOBL vs. LOAL capability. 2015-04-16 09:35:21 -07:00
KoffeinFlummi
bf0aa6f344 Merge branch 'spanish-merge' 2015-04-16 18:32:37 +02:00
KoffeinFlummi
11f9478035 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/atragmx/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
 2015-04-16 18:31:31 +02:00
ulteq
4e4dee18df Added missing privates / Removed unused privates 2015-04-16 18:21:19 +02:00
ulteq
fa39e8f001 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 18:14:42 +02:00
ulteq
e35d3dab49 Overworked the ATragMX target slot logic: 
*Added missing privates
*Solutions are now automatically calculated on target/gun selection
 2015-04-16 18:14:32 +02:00
ulteq
5117595ecc Minor performance improvement 2015-04-16 17:52:21 +02:00
ulteq
defe46b769 Added new PFH abort condition (velocity < 100 m/s) 2015-04-16 17:30:50 +02:00
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
jaynus
5923f246fd Fixed: only exit on shooter. 2015-04-15 09:25:19 -07:00
jaynus
c793df4848 Changed: Safety mode on Titan, it now doesnt show as unloaded Fixed: Some TOP shots would miss, Fixed: Lock constraints would show on fast weapon switch. 2015-04-15 09:10:00 -07:00
ruPaladin
a3965424b9 addons/medical translation to Russian 2015-04-15 19:09:10 +03:00
Marco
ad67fca8f4 Update stringtable.xml 2015-04-15 17:45:48 +02:00
Ivan Navarro Cabello
40b784fb7a update stringtable 
added spanish translate
 2015-04-15 17:41:10 +02:00
ruPaladin
9caba1e3a3 addons/weather/ translation to Russian 2015-04-15 18:29:38 +03:00
ruPaladin
64504a9515 addons/interact_menu translation to Russian 2015-04-15 18:27:28 +03:00
ruPaladin
6fca601759 Kestrel 4500NV translation to Russian 2015-04-15 18:24:57 +03:00
jaynus
0d28a890e1 Fixes: Cycle fire mode on Titan was not working. Closes #603 2015-04-15 08:19:21 -07:00
Legolasindar
bbc24b6d02 Update stringtable.xml 
added spanish translate
 2015-04-15 16:49:43 +02:00
commy2
9c1b40f5a3 preparing for improved positions of action points 2015-04-15 16:40:20 +02:00
ulteq
98d0c06ce3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 16:22:50 +02:00
ulteq
95b04d0840 Added custom airFriction values for the new marksmen ammo types. 2015-04-15 16:22:42 +02:00
commy2
6710040633 toLower in, always follow your own advice 2015-04-15 16:13:53 +02:00
KoffeinFlummi
250d6acb22 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 2015-04-15 16:09:40 +02:00
commy2
bf8f9b4818 all I need is a $ 2015-04-15 15:34:01 +02:00
KoffeinFlummi
1fc546a700 Merge branch 'polish-merge' 2015-04-15 15:10:41 +02:00
KoffeinFlummi
79934cfb78 Merge https://github.com/Coren4/ACE3 into polish-merge 2015-04-15 15:10:28 +02:00
ulteq
1e326c17ad Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 15:06:35 +02:00
commy2
eecf405fda Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 15:06:29 +02:00
ulteq
238cf1cc63 Added keybinds for ATragMX and Kestrel 4500 (empty by default) 2015-04-15 15:06:28 +02:00
commy2
5eededd3e1 Recoil overhaul initial commmit 2015-04-15 15:01:07 +02:00
Nicolás Badano
69489df910 Merge pull request #610 from ramius86/patch-3 
Update stringtable.xml
 2015-04-15 09:57:27 -03:00
Nicolás Badano
527385e6e1 Merge pull request #609 from ramius86/patch-2 
Update stringtable.xml
 2015-04-15 09:57:15 -03:00
KoffeinFlummi
21305629ed Merge branch 'patch-1' of https://github.com/nomisum/ACE3 into german-merge 2015-04-15 14:53:27 +02:00
commy2
e3d1946924 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 14:37:49 +02:00
KoffeinFlummi
8b915380b7 Merge branch 'hungarian-merge' 2015-04-15 13:55:02 +02:00
KoffeinFlummi
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00
ulteq
9f289e1721 Fixed incorrect return values in some key handlers: 
*Wind info
*Protractor
 2015-04-15 12:53:02 +02:00
ulteq
42dbd8f5d2 Continued work on the magazine classes: 
*Fixed Katiba using the wrong magazine
*Added ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim
*Added ACE_10Rnd_338_300gr_HPBT_Mag
*Changed some of the .338 magazine initSpeeds to match the new Mar-10 barrel length
*Added the new caseless green ir dim magazine to the ammo crates
*Allowed the Mar-10 to shoot .300 Win Mag
 2015-04-15 12:30:48 +02:00
ulteq
bd5ed13621 Added ACE_65x39_Caseless_green_Tracer_Dim 2015-04-15 12:27:20 +02:00
Marco
bc62891122 Update stringtable.xml 
Italian
 2015-04-15 11:24:20 +02:00
Marco
76ff1da57a Update stringtable.xml 
Italian
 2015-04-15 11:19:54 +02:00
Marco
47f8161855 Update stringtable.xml 
Italian
 2015-04-15 11:18:22 +02:00
Marco
924cd80e60 Update stringtable.xml 
ITalian
 2015-04-15 11:13:47 +02:00
Marco
cb2e1c5116 Update stringtable.xml 
Italian
 2015-04-15 11:13:19 +02:00
Marco
5238647021 Update stringtable.xml 
Italian
 2015-04-15 11:12:15 +02:00
Marco
f931c1a42c Update stringtable.xml 
Italian
 2015-04-15 11:10:05 +02:00
Marco
96be1baddc Update stringtable.xml 
Italian
 2015-04-15 11:08:43 +02:00
Marco
8c0f52e615 Update stringtable.xml 
Italian
 2015-04-15 11:08:04 +02:00
Marco
d1936d8e1b Update stringtable.xml 
Italian
 2015-04-15 11:06:42 +02:00
Marco
5c7b8247c5 Update stringtable.xml 
Italian
 2015-04-15 11:05:57 +02:00
Marco
6e7c1ce9d2 Update stringtable.xml 
Ita
 2015-04-15 11:04:18 +02:00
Marco
544894a05e Update stringtable.xml 
Italian
 2015-04-15 10:59:44 +02:00
Marco
9a8dd905f2 Update stringtable.xml 2015-04-15 10:56:39 +02:00
Marco
eceb759523 Update stringtable.xml 
Italian
 2015-04-15 10:53:35 +02:00
Marco
b28ef3d22d Update stringtable.xml 
Italian
 2015-04-15 10:52:40 +02:00
Marco
45fec0409d Update stringtable.xml 
Italian
 2015-04-15 10:51:26 +02:00
Marco
c9e452a000 Update stringtable.xml 
Italian
 2015-04-15 10:48:52 +02:00
Marco
aaee9c72c1 Update stringtable.xml 
Italian translation
 2015-04-15 10:44:13 +02:00