Commit Graph

3050 Commits

Author SHA1 Message Date
jaynus
57acee0f89 Changed: Cleaned up Missile guidance setting for AI, SCALAR. 2015-04-14 19:19:14 -07:00
esteldunedain
53ce7d0be4 Increase the tolerance to 2m 2015-04-14 23:12:48 -03:00
esteldunedain
7a606a2352 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 22:54:10 -03:00
esteldunedain
ee34078960 Add early visibility check to interact menu 2015-04-14 22:53:10 -03:00
PabstMirror
00b9e2d72c draw3d 2015-04-14 20:49:44 -05:00
PabstMirror
91c8c89e87 Only sync A3 VON status over network 2015-04-14 20:47:07 -05:00
jaynus
b307b4bc4b Fixed: Flummi missed 2 isClientSettable renames. 2015-04-14 18:38:52 -07:00
jaynus
ad95105508 Added and enabled AMG for AI. 2015-04-14 18:25:02 -07:00
jaynus
ef6d090238 Fixed: JAV_DIR was erroring. 2015-04-14 18:18:38 -07:00
jaynus
37de67395f Fixed: issue where Javelin wouldn't hit > 1500 2015-04-14 18:18:27 -07:00
commy2
2940d1f83c base rallypoints create a respawn marker if none is present in the mission 2015-04-15 03:10:17 +02:00
PabstMirror
1488ba2aac #595 - Hide ace optino button if no world loaded
I wanted to use a rscMapControl onDraw, but it throws an error
onMouseMoving seems odd, but it works and I don't have to overload
onLoad
2015-04-14 19:52:35 -05:00
commy2
e1926c6af1 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 02:12:16 +02:00
jaynus
b39209cc28 BAD @esteldunedain! BAD DOGGY! 2015-04-14 17:09:13 -07:00
commy2
29633d763a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 02:05:55 +02:00
commy2
4cdf61ab9e fix misc issues with rallypoints 2015-04-15 01:50:58 +02:00
Nicolás Badano
4d6e757409 Merge pull request #596 from gienkov/patch-4
PL translation fix
2015-04-14 20:45:23 -03:00
Grzegorz
d538cd257c PL translation fix
Typo, wrote Mk248 Mod 0, should be Mk248 Mod 1
2015-04-15 01:44:33 +02:00
Nicolás Badano
10b1587453 Merge pull request #592 from gienkov/master
PL translation
2015-04-14 20:36:25 -03:00
esteldunedain
88b78ad3ca Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 20:21:39 -03:00
esteldunedain
ee04ea2f41 Allow actions on coordinates instead of selections 2015-04-14 20:21:11 -03:00
Grzegorz Sikora
3543b9c806 PL Translation
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
2015-04-15 00:43:42 +02:00
Grzegorz Sikora
dc45228e32 Merge branch 'master' of https://github.com/gienkov/ACE3 2015-04-15 00:42:38 +02:00
jaynus
81e61e2f04 Added non-radio speaking event to ACRE isSpeaking functionality. Why is this propegating a setVariable every speaking event though? ACRE already propegates that. Closes #591 2015-04-14 15:30:04 -07:00
esteldunedain
2ff6eef792 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 19:18:08 -03:00
esteldunedain
ad750977e0 Fix ACRE volume on medical unconsciousness 2015-04-14 19:17:05 -03:00
jaynus
10bb77e738 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 15:11:55 -07:00
jaynus
c136b78fc8 rename 20mm 2015-04-14 15:11:49 -07:00
esteldunedain
495c822061 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 19:10:31 -03:00
esteldunedain
6f4bb48489 Merge branch 'master' into linearMenuExperiment
Conflicts:
	addons/attach/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/overheating/stringtable.xml
	extensions/CMakeLists.txt
2015-04-14 19:09:57 -03:00
commy2
7c5a6538a9 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 00:06:12 +02:00
jaynus
36ebb96531 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 14:58:29 -07:00
jaynus
85c10328ae missed one. 2015-04-14 14:58:19 -07:00
Felix Wiegand
5d8dd701d2 Merge pull request #518 from acemod/basic-medical-tweaks
Basic medical tweaks
2015-04-14 23:49:00 +02:00
jaynus
df3c8155a0 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 14:45:30 -07:00
jaynus
c6943fbdaf fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588 2015-04-14 14:45:21 -07:00
commy2
4c6cc8dddf merging stringtables 2015-04-14 23:22:25 +02:00
KoffeinFlummi
9b80245479 Fix speed limiter not working 2015-04-14 23:13:02 +02:00
KoffeinFlummi
8b1bce3b3d Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-14 23:00:59 +02:00
KoffeinFlummi
9e64538bc7 Fix minor adjustment strings 2015-04-14 23:00:17 +02:00
KoffeinFlummi
f07949cf19 Remove some old todos 2015-04-14 22:57:18 +02:00
KoffeinFlummi
676f7c8732 Remove hitpart from action names for non-self 2015-04-14 22:50:06 +02:00
KoffeinFlummi
13d7649c4a Buff colour flashing effect 2015-04-14 22:49:26 +02:00
KoffeinFlummi
2391c5e6d6 Tweak crate names 2015-04-14 22:34:19 +02:00
KoffeinFlummi
91e25dc215 Missing stringtable entries 2015-04-14 22:34:08 +02:00
ulteq
8aad369ed3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-14 22:23:56 +02:00
ulteq
035ed573b8 Reworked the magazine configs 2015-04-14 22:23:36 +02:00
ulteq
1d64b8c36e Added the new magazines into various ammo boxes 2015-04-14 22:22:36 +02:00
ulteq
e214511e36 Added new magazine classes:
*ACE_100Rnd_65x39_caseless_mag_Tracer_Dim
*ACE_200Rnd_65x39_cased_Box_Tracer_Dim
*ACE_30Rnd_556x45_Stanag_Mk262_mag
*ACE_30Rnd_556x45_Stanag_Mk318_mag
*ACE_10Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x67_Mk248_Mod_0_Mag
*ACE_20Rnd_762x67_Mk248_Mod_1_Mag
*ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag
*ACE_30Rnd_65x47_Scenar_mag
*ACE_10Rnd_762x54_Tracer_mag
2015-04-14 22:19:51 +02:00
ulteq
f0a716fee8 Added new ammo classes:
*762x67mm Mk248 Mod 0
*762x67mm Mk248 Mod 1
*762x67mm Berger Hybrid OTM
*65x47mm Scenar
2015-04-14 22:17:27 +02:00