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 |
|
KoffeinFlummi
|
7af6ea36a6
|
Fix missing pain effect option name
|
2015-04-14 22:07:43 +02:00 |
|
KoffeinFlummi
|
348bf611f8
|
Merge branch 'master' into basic-medical-tweaks
|
2015-04-14 21:55:45 +02:00 |
|
KoffeinFlummi
|
684c36f8a5
|
Add pain effect option
|
2015-04-14 21:49:56 +02:00 |
|
Nicolás Badano
|
462947a04c
|
Merge pull request #585 from acemod/fix-clientSetable
Fix spelling of "isClientSetable"
|
2015-04-14 16:48:50 -03:00 |
|
KoffeinFlummi
|
ebcdafe610
|
Fix spelling of "isClientSetable"
|
2015-04-14 21:43:19 +02:00 |
|
KoffeinFlummi
|
e7807c009f
|
Use playerInventoryChanged instead of Take
This makes sure to also fire when other mods, like TFAR (when adding
backpacks) add items via script.
|
2015-04-14 21:28:18 +02:00 |
|
jaynus
|
2f2eab87e2
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-04-14 11:42:38 -07:00 |
|
jaynus
|
739807303b
|
Fix script error for canceling designation and dying while designating.
|
2015-04-14 11:42:26 -07:00 |
|
KoffeinFlummi
|
71b19b4621
|
Remove duplicate bleeding code
|
2015-04-14 20:40:38 +02:00 |
|
KoffeinFlummi
|
ba377dfd3a
|
Show seperate message for "scratches"; localize
|
2015-04-14 20:40:17 +02:00 |
|
KoffeinFlummi
|
c6118901b4
|
Merge branch 'master' into basic-medical-tweaks
|
2015-04-14 20:35:17 +02:00 |
|
KoffeinFlummi
|
7ca36cdb65
|
Always show wounds, even for very low damage
|
2015-04-14 20:28:19 +02:00 |
|
KoffeinFlummi
|
a4c93ab2e2
|
Add seperate crates for basic and advanced
|
2015-04-14 20:28:00 +02:00 |
|
KoffeinFlummi
|
c379f2775e
|
Style fixes
|
2015-04-14 20:27:42 +02:00 |
|
jaynus
|
0ae27d16c5
|
Merge pull request #580 from acemod/seeker_fov
Seeker FOV check optimizations
|
2015-04-14 11:19:00 -07:00 |
|
jaynus
|
24830f815f
|
random lock interval was causing phasing.
|
2015-04-14 11:18:16 -07:00 |
|
ulteq
|
cf7caf4549
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-14 20:18:03 +02:00 |
|
ulteq
|
837f155ad7
|
Fixed incorrect key handler return value
|
2015-04-14 20:17:54 +02:00 |
|
jaynus
|
1dd41a00ba
|
integration.
|
2015-04-14 10:51:53 -07:00 |
|
jaynus
|
226312c504
|
Merge remote-tracking branch 'origin/master' into seeker_fov
Conflicts:
addons/missileguidance/functions/fnc_checkSeekerAngle.sqf
|
2015-04-14 10:47:40 -07:00 |
|
jaynus
|
511ca860e0
|
Merge pull request #579 from acemod/moreJavelinLockingFixes
More javelin locking + UI fixes
|
2015-04-14 10:40:51 -07:00 |
|
jaynus
|
fb5b524023
|
Loosen DAGR curve
|
2015-04-14 10:39:00 -07:00 |
|
jaynus
|
f0940707be
|
Disable locking on unloaded. Closes #539
|
2015-04-14 10:27:37 -07:00 |
|
jaynus
|
6f3ce27894
|
Javelin refined, working, locking fixes, UI fixes, missile guidance rewrite
|
2015-04-14 10:25:08 -07:00 |
|
jaynus
|
c436541f1c
|
Reworked, fun fun.
|
2015-04-14 09:36:39 -07:00 |
|
jaynus
|
376f924999
|
Finish guidance rewrite.
|
2015-04-14 08:24:13 -07:00 |
|
Nicolás Badano
|
a93cb310d4
|
Merge pull request #513 from acemod/mainCleanup
ACE_Main major cleanup
|
2015-04-14 10:25:14 -03:00 |
|
esteldunedain
|
c827c72412
|
AB and Kestrel: Move macros from defines.h to script_component
|
2015-04-14 10:22:26 -03:00 |
|
KoffeinFlummi
|
57c526c04d
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-14 15:12:46 +02:00 |
|
KoffeinFlummi
|
c1fccecb21
|
Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge
|
2015-04-14 15:12:24 +02:00 |
|
Nicolás Badano
|
85d253cdc1
|
Merge pull request #574 from gienkov/master
Advanced Ballistics PL translation
|
2015-04-14 10:10:59 -03:00 |
|
KoffeinFlummi
|
b563bf8a8e
|
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
|
2015-04-14 15:04:42 +02:00 |
|
KoffeinFlummi
|
63fe4118d4
|
Merge https://github.com/FreeZbe/ACE3 into french-merge
|
2015-04-14 14:48:13 +02:00 |
|
commy2
|
ea7659a36e
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
|
2015-04-14 13:36:02 +02:00 |
|
commy2
|
f89e02a5ca
|
fix no laser in ffv slots
|
2015-04-14 13:24:17 +02:00 |
|
commy2
|
83ce3fa2bd
|
remove drawline3d
|
2015-04-14 13:14:37 +02:00 |
|
ulteq
|
994071960c
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-14 12:52:30 +02:00 |
|
ulteq
|
1a39005e72
|
Removed debug output.
|
2015-04-14 12:52:21 +02:00 |
|
KoffeinFlummi
|
96319c8799
|
Merge https://github.com/ruPaladin/ACE3 into russian-merge
|
2015-04-14 12:50:14 +02:00 |
|
Coren4
|
83c8abb3ba
|
Update stringtable.xml
|
2015-04-14 12:41:35 +02:00 |
|
ulteq
|
44232987b0
|
Commented out deprecated icon paths
|
2015-04-14 12:34:27 +02:00 |
|
ulteq
|
3d558f376f
|
Fixed some icon path names
|
2015-04-14 12:16:29 +02:00 |
|
Grzegorz Sikora
|
1be197728e
|
AdvBal PL translation
|
2015-04-14 11:42:52 +02:00 |
|
ulteq
|
864a3c3cda
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500
Conflicts:
addons/weather/XEH_postInit.sqf
|
2015-04-14 11:14:27 +02:00 |
|
ulteq
|
5a7078ad2c
|
Removed a deprecated workaround
|
2015-04-14 11:12:58 +02:00 |
|
ulteq
|
9f0388fa12
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics
|
2015-04-14 11:09:38 +02:00 |
|
ulteq
|
983a36e52d
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX
|
2015-04-14 11:06:32 +02:00 |
|
ulteq
|
d931745f5c
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments
|
2015-04-14 11:02:37 +02:00 |
|
ulteq
|
2f39067cb3
|
Removed TABs
|
2015-04-14 10:47:09 +02:00 |
|
jaynus
|
22d90fee9a
|
Begin modelToWorld work.
|
2015-04-13 16:47:09 -07:00 |
|
jaynus
|
761fef39c8
|
working save.
|
2015-04-13 15:34:51 -07:00 |
|
commy2
|
3da3543381
|
toggle laser vs ir laser
|
2015-04-14 00:32:09 +02:00 |
|
Harakhti
|
e7e46b3b59
|
Translation: S to W
That's all I've found so far.
|
2015-04-14 00:05:39 +02:00 |
|
Harakhti
|
8bfd915ec4
|
Translation: N to R
This was a lot more fun than the previous two were. 12 folders left...
|
2015-04-13 23:45:44 +02:00 |
|
commy2
|
c95bd42a19
|
Merge pull request #548 from acemod/opticsfix
fix misc issues with optics, fix #537
|
2015-04-13 23:22:12 +02:00 |
|
ulteq
|
acc021c11c
|
Replaced TABs and newline braces
|
2015-04-13 23:10:55 +02:00 |
|
Harakhti
|
1b60a335a5
|
Translation: J to M
I feel burned out. This was very specifically long and tedious.
|
2015-04-13 23:03:09 +02:00 |
|
commy2
|
b72366f0f6
|
hide laser beam during day
|
2015-04-13 22:34:43 +02:00 |
|
commy2
|
ada62fca7d
|
reloading launchers didn't work on remote clients
|
2015-04-13 21:38:01 +02:00 |
|
ulteq
|
c2ac7fc547
|
Removed magazines module
|
2015-04-13 21:37:19 +02:00 |
|
ulteq
|
33a06c5706
|
Updated stringtable
|
2015-04-13 21:36:47 +02:00 |
|
ulteq
|
2332f19274
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics
Conflicts:
addons/ballistics/stringtable.xml
addons/magazines/CfgAmmo.hpp
addons/magazines/CfgMagazines.hpp
addons/magazines/CfgVehicles.hpp
addons/magazines/CfgWeapons.hpp
addons/magazines/newclasses.txt
|
2015-04-13 21:35:53 +02:00 |
|
ulteq
|
1073f4e484
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX
Conflicts:
AUTHORS.txt
|
2015-04-13 21:33:12 +02:00 |
|
ulteq
|
032d745334
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments
|
2015-04-13 21:32:09 +02:00 |
|
ulteq
|
fa88ab484e
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500
Conflicts:
addons/kestrel/stringtable.xml
|
2015-04-13 21:31:04 +02:00 |
|
Nicolás Badano
|
db6361a086
|
Merge pull request #565 from Kllrt/master
Added another new CZ strings
|
2015-04-13 16:25:32 -03:00 |
|
ulteq
|
ea78a6325f
|
Changed the module setting defaults
|
2015-04-13 21:20:07 +02:00 |
|
ulteq
|
1b2691ff1c
|
Fixed incorrect calculation of the scope adjustment limits
|
2015-04-13 21:17:30 +02:00 |
|
Kllrt
|
1c611ba2db
|
Added another new CZ strings
|
2015-04-13 21:15:04 +02:00 |
|
ulteq
|
8edb2d2c49
|
Complete overhaul of all ammo/magazine and weapon classes:
*Merged the magazines- into the ballistics module
*Adjusted all magazine class initSpeeds
*Adjusted all weapon class initSpeeds
|
2015-04-13 21:08:31 +02:00 |
|
commy2
|
804079cfae
|
manual merge
|
2015-04-13 20:20:55 +02:00 |
|
Harakhti
|
3c3f6ba4c3
|
Translation: A to I
Some parts filled out, other parts corrected or stylized.
|
2015-04-13 19:28:58 +02:00 |
|
commy2
|
bd168981e2
|
how do I merge
|
2015-04-13 19:23:42 +02:00 |
|
bux578
|
0e6eb46bb4
|
Merge pull request #560 from gienkov/master
Further PL translation fixes
|
2015-04-13 19:18:54 +02:00 |
|
commy2
|
fa64225e55
|
Merge pull request #505 from acemod/muteunit
Muteunit framework, fix #473
|
2015-04-13 19:18:45 +02:00 |
|
commy2
|
f48b6dc77a
|
Merge pull request #519 from acemod/marksmenai
increase engagement ranges / burst mode on new mmg / full auto dmr
|
2015-04-13 19:18:40 +02:00 |
|
Grzegorz
|
2cd456432e
|
Update stringtable.xml
|
2015-04-13 19:17:42 +02:00 |
|
Grzegorz
|
5269f32d62
|
weird but fixed
Something went wrong there, but fixed
|
2015-04-13 19:11:39 +02:00 |
|
jaynus
|
ff858c1194
|
Begin stateful guidance. Re-write of TOP down because it wasnt even running. LIN was default. but it was broken anyways.
|
2015-04-13 09:56:15 -07:00 |
|
jaynus
|
e5d8fe2634
|
Guidance timing per FPS fixes.
|
2015-04-13 09:24:28 -07:00 |
|
jaynus
|
3e7c8ca634
|
remove optic debug.
|
2015-04-13 09:03:19 -07:00 |
|
Grzegorz Sikora
|
ac886828b0
|
Fixes
|
2015-04-13 18:02:48 +02:00 |
|
jaynus
|
6aa9f5bcbc
|
NFOV/WFOV
|
2015-04-13 09:01:18 -07:00 |
|
jaynus
|
c66f99faac
|
Fixed: Locking reticles would lock out-of-order. Fixed: Locking was hard. Fixes #539
|
2015-04-13 08:59:36 -07:00 |
|
jaynus
|
2d6b2f9a1a
|
I had accidently commented out seeker FOV on the Titan rockets.
|
2015-04-13 08:33:03 -07:00 |
|
Grzegorz
|
ec381699ca
|
fix missing class
Am I doin it right?
Works for me.
|
2015-04-13 16:48:14 +02:00 |
|
bux578
|
cba66366bd
|
fix invalid xml
|
2015-04-13 15:25:51 +02:00 |
|
bux578
|
8c24d9ec35
|
fix invalid xml, fix duplicate keys
|
2015-04-13 15:25:30 +02:00 |
|
ulteq
|
c12cc24a78
|
TABS:
* "kill them with fire"
* "then kill them again, with a rusty spoon"
|
2015-04-13 14:48:31 +02:00 |
|
ulteq
|
d8c23c2a64
|
Merged advanced_ballistics\CfgWeapons.cpp into ballistics\CfgWeapons.hpp
|
2015-04-13 14:46:21 +02:00 |
|
KoffeinFlummi
|
363a6b3738
|
Fix erroneus tag in nametags stringtable
Re: f6c7d444
|
2015-04-13 14:32:55 +02:00 |
|
KoffeinFlummi
|
8d4003a396
|
Merge https://github.com/HerrStein/ACE3 into german-merge
|
2015-04-13 14:21:00 +02:00 |
|
KoffeinFlummi
|
f6c7d444e1
|
Merge https://github.com/Anthariel/ACE3 into french-merge
|
2015-04-13 13:31:48 +02:00 |
|
commy2
|
f94b4befef
|
initial commit
|
2015-04-13 13:04:23 +02:00 |
|
KoffeinFlummi
|
b93cf4fb4a
|
Merge branch 'polish-merge'
|
2015-04-13 13:01:17 +02:00 |
|
KoffeinFlummi
|
118b5509ea
|
Merge https://github.com/gienkov/ACE3 into polish-merge
|
2015-04-13 13:00:59 +02:00 |
|
ulteq
|
5354d6578b
|
Simplified the AB PFH massively
|
2015-04-13 12:56:53 +02:00 |
|
ulteq
|
63760acc4f
|
Added an error message when the ab extension is missing
|
2015-04-13 12:56:18 +02:00 |
|
ulteq
|
c8aa3032fe
|
Added some sanity checks to the module setting initialization
|
2015-04-13 12:54:06 +02:00 |
|
commy2
|
fce7c4d0be
|
manual merge
|
2015-04-13 12:52:47 +02:00 |
|
commy2
|
0214d891e1
|
fix misc issues with optics, fix #537
|
2015-04-13 12:04:43 +02:00 |
|
ulteq
|
4355df118c
|
Refactored the Kestrel4500 Code.
|
2015-04-13 11:53:19 +02:00 |
|
Kllrt
|
915ac46e04
|
Very small typo in CZ translation
-.-
|
2015-04-13 11:00:47 +02:00 |
|
ruPaladin
|
ccc2124abe
|
Russian translation for addons/interaction
Fix for addons/interaction translation.
|
2015-04-13 11:53:15 +03:00 |
|
PabstMirror
|
bf3e3d3b64
|
#542 - ACE_fakeWeapon not found
|
2015-04-13 03:46:42 -05:00 |
|
ulteq
|
c98422b2c6
|
Shrinked some of the .paa files
|
2015-04-13 10:45:37 +02:00 |
|
ulteq
|
deadbd9414
|
Reduced the amount of LOD levels of the Kestrel
|
2015-04-13 10:39:31 +02:00 |
|
ulteq
|
939365a376
|
New texture for the Kestrel model
|
2015-04-13 10:39:14 +02:00 |
|
PabstMirror
|
7111cdd8ff
|
#540 - remove debug spam
|
2015-04-13 03:16:33 -05:00 |
|
PabstMirror
|
2a015482a1
|
Old Interaction Events (1713999 is long dead)
|
2015-04-13 01:03:08 -05:00 |
|
PabstMirror
|
878bdadbb3
|
Switch clientInit to postInit
|
2015-04-13 00:46:45 -05:00 |
|
PabstMirror
|
70dbae5a25
|
#527 - Unconscious switching groups
|
2015-04-13 00:32:07 -05:00 |
|
PabstMirror
|
669dbe10c9
|
BecomeLeader - Don't create new group
|
2015-04-13 00:23:00 -05:00 |
|
Nou
|
b58598c6aa
|
Woops, missing )
|
2015-04-12 21:47:27 -07:00 |
|
PabstMirror
|
b50a7a0147
|
Try to fix degree symbol (encoding issue)
|
2015-04-12 22:56:46 -05:00 |
|
PabstMirror
|
7719da2f66
|
Javelin Localiztion
|
2015-04-12 22:45:55 -05:00 |
|
PabstMirror
|
36b92b3d44
|
Don't do client stuff on dedicated.
|
2015-04-12 22:44:19 -05:00 |
|
Nou
|
4c74ff8717
|
FOV check made faster.
|
2015-04-12 19:49:14 -07:00 |
|
Nou
|
dc5028275a
|
Seeker FOV implemented, fast FOV check.
|
2015-04-12 19:16:58 -07:00 |
|
Anthariel
|
3e8c8384cf
|
Update stringtable.xml
Missing translation
|
2015-04-13 02:24:13 +02:00 |
|
Anthariel
|
8339d15087
|
Update stringtable.xml
Added: French translations (note, I've already removed a % at the line 30
|
2015-04-13 02:21:57 +02:00 |
|
Anthariel
|
7a8cd684a3
|
Update stringtable.xml
|
2015-04-13 02:19:58 +02:00 |
|
Anthariel
|
2939862e8c
|
Update stringtable.xml
|
2015-04-13 02:12:56 +02:00 |
|
Anthariel
|
d9f9dffbc0
|
Update stringtable.xml
|
2015-04-13 02:11:12 +02:00 |
|
Anthariel
|
e176df4636
|
Update stringtable.xml
|
2015-04-13 02:10:23 +02:00 |
|
Anthariel
|
7523dd011f
|
Update stringtable.xml
|
2015-04-13 02:06:17 +02:00 |
|
Anthariel
|
161866a8e5
|
Update stringtable.xml
|
2015-04-13 02:05:36 +02:00 |
|
Anthariel
|
67be340360
|
Update stringtable.xml
|
2015-04-13 02:05:15 +02:00 |
|
Nou
|
8df26b3246
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-12 17:03:16 -07:00 |
|
Nou
|
98acdc4089
|
M22 binocular mil reticle ported from ACE2.
|
2015-04-12 17:03:11 -07:00 |
|
Anthariel
|
77058857e6
|
Update stringtable.xml
Wrong translation
|
2015-04-13 02:02:19 +02:00 |
|
jaynus
|
0c3caffe89
|
Merge pull request #501 from acemod/network_lasers
Break all the lasers. Continuing expansion work is in #535
|
2015-04-12 16:47:24 -07:00 |
|
jaynus
|
fd4cb50d3d
|
Remove thermal, prep for coding.
|
2015-04-12 16:44:39 -07:00 |
|
jaynus
|
db5d54dffd
|
Only allow for laser designator for vanilla compensation.
|
2015-04-12 16:38:43 -07:00 |
|
Anthariel
|
0e925bc006
|
Update stringtable.xml
|
2015-04-13 01:31:49 +02:00 |
|
Anthariel
|
bd28f08559
|
Update stringtable.xml
|
2015-04-13 01:30:50 +02:00 |
|
Anthariel
|
c2253cf199
|
Update stringtable.xml
|
2015-04-13 01:30:16 +02:00 |
|
PabstMirror
|
74967910a3
|
opps
|
2015-04-12 18:27:55 -05:00 |
|
PabstMirror
|
d50bff866b
|
addToInventory use addMagazineArray -maybe fix #530
|
2015-04-12 18:27:25 -05:00 |
|
jaynus
|
9a25fb4f2f
|
Remove debug.
|
2015-04-12 16:19:18 -07:00 |
|
jaynus
|
4bd489cd96
|
Fixed: Javelin CLU UI should have been a PFH not a draw. Migrated. Closes #531
|
2015-04-12 16:18:39 -07:00 |
|
Anthariel
|
9bb865a73f
|
Update stringtable.xml
|
2015-04-13 01:18:24 +02:00 |
|
Anthariel
|
2ec9b94083
|
Update stringtable.xml
Fixed: Wrong translation (thx Dirtyhank)
|
2015-04-13 01:18:04 +02:00 |
|
Anthariel
|
638868b3da
|
Update stringtable.xml
Added: French translation (100%).
|
2015-04-13 00:41:50 +02:00 |
|
ulteq
|
95e7f66a46
|
Added a model for the Kestrel 4500
*We might want to use a smaller one in the future ...
|
2015-04-13 00:17:59 +02:00 |
|
PabstMirror
|
807ebd8bfe
|
Resave reticle_titan in objectBuilder
|
2015-04-12 17:14:30 -05:00 |
|
ulteq
|
2040f4dcc3
|
Improved the wind speed calculation if AB is not enabled
|
2015-04-12 23:25:58 +02:00 |
|
ulteq
|
3c25fd4008
|
Fixed a typo
|
2015-04-12 23:20:54 +02:00 |
|
ulteq
|
e3aa9b3d22
|
Added a RSC preload class
|
2015-04-12 23:20:27 +02:00 |
|
jaynus
|
509b5e1a05
|
Integration of lasers for vanilla laser designation as well. Remove debug.
|
2015-04-12 14:12:21 -07:00 |
|
jaynus
|
c9e2eb0869
|
Changed: no-crosshair reticle for Titan by BlackPixxel
|
2015-04-12 14:05:12 -07:00 |
|
ulteq
|
7797cd9a38
|
Added missing abs()
|
2015-04-12 23:03:20 +02:00 |
|
jaynus
|
2317a3c988
|
Visually hide laser targets.
|
2015-04-12 14:03:15 -07:00 |
|
ulteq
|
705017f222
|
Implemented the Kestrel4500 spinning wheel animation
|
2015-04-12 22:54:36 +02:00 |
|
licht-im-Norden87
|
075b52c1ff
|
Update stringtable.xml
|
2015-04-12 22:53:02 +02:00 |
|
jaynus
|
2e83e56a73
|
Seeker integration.
|
2015-04-12 13:02:09 -07:00 |
|
PabstMirror
|
38c3f43dd6
|
Fix UBC
Updating base class Turrets->, by
z\ace\addons\missileguidance\config.bin/CfgVehicles/B_Heli_Attack_01_F/Turrets/
|
2015-04-12 14:39:49 -05:00 |
|
jaynus
|
5251de8447
|
break out seeker angle check. more laser code cleanup.
|
2015-04-12 12:16:26 -07:00 |
|
jaynus
|
9287d6fe44
|
Remove dead code.
|
2015-04-12 11:46:28 -07:00 |
|
jaynus
|
7f0e54b9c3
|
More defaults.
|
2015-04-12 11:43:37 -07:00 |
|
jaynus
|
197b13e6d9
|
Use current codes for FCS updates.
|
2015-04-12 11:41:50 -07:00 |
|
jaynus
|
9273a32d23
|
code cleanup, default laser parameters, getVariable self designation specifics.
|
2015-04-12 11:38:07 -07:00 |
|
jaynus
|
6be8cc8d84
|
Removed: Laser visuals
Updated: comments and function defs
Changed: pass function name, not full code.
|
2015-04-12 11:29:33 -07:00 |
|
jaynus
|
887e1d1d99
|
Remove optional laser visual.
|
2015-04-12 11:14:12 -07:00 |
|
jaynus
|
16cd05edc8
|
Merge branch 'network_lasers' of github.com:acemod/ACE3 into network_lasers
|
2015-04-12 11:01:27 -07:00 |
|
jaynus
|
01797fd3b9
|
Integarate laser code into SALH guidance + self_designate. Note todo items.
|
2015-04-12 11:01:22 -07:00 |
|
Nou
|
4a23b8be00
|
Allow string function names.
|
2015-04-12 10:52:50 -07:00 |
|
nomisum
|
ca27e6eb5a
|
fixed typo
`Erweitertes Raketenlenksystem` shoud be a nominalization
|
2015-04-12 19:52:37 +02:00 |
|
ulteq
|
40e013ed6d
|
Added SORD interface (Connection to the Vectronix Vector LRF)
|
2015-04-12 19:51:13 +02:00 |
|
nomisum
|
b1c29f82c2
|
improved/added german translation
Imho `Raketenlenksystem` is the best fitting german translation for missile guidance. `Raketenlenkung` sounds a bit too colloquial.
|
2015-04-12 19:41:44 +02:00 |
|
commy2
|
10c32f264e
|
increase engagement ranges / burst mode on new mmg / full auto dmr
|
2015-04-12 18:21:28 +02:00 |
|
Anthariel
|
45f3300967
|
Update stringtable.xml
Added: Missing french translation.
|
2015-04-12 18:20:32 +02:00 |
|
Anthariel
|
8d79fd242a
|
Update stringtable.xml
Added: Some missing french translations. (I took 10 minutes to translate the banana description (-:)
|
2015-04-12 18:18:52 +02:00 |
|
Anthariel
|
3db8f4ad44
|
Update stringtable.xml
Added: Some missing french translation.
|
2015-04-12 18:10:41 +02:00 |
|