IngoKauffmann
8a4b3a117a
Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm
2015-10-18 12:49:36 +02:00
Glowbal
3682a1710b
Merge pull request #2527 from alef/issues/titan_miss
...
Fix: Titan hitting ground instead of vehicle
2015-10-18 12:11:09 +02:00
Alessandro Foresi
22ac16ead5
Changed: Seeker to aimPoint instead of ASL position
2015-09-19 16:22:36 +02:00
PabstMirror
db41512dc0
#2349 - Don't disable locking for base RocketPods
2015-09-14 22:11:12 -05:00
KoffeinFlummi
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
kaban
08b7110e58
Russian Translations - Update
2015-09-03 04:54:52 +03:00
kaban
91cae690c0
Russian Translations - Update
2015-09-03 03:36:15 +03:00
KoffeinFlummi
a7f2a7fefc
Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3
2015-08-30 00:35:11 +02:00
jonpas
387aad4204
Removed 3rd party config, Moved ACE Hydra to rearm config to missileguidance
2015-08-18 03:18:38 +02:00
PabstMirror
b3741f4036
Capitalization for macro CBA_fnc_addPerFrameHandler
2015-08-04 02:34:38 -05:00
Harakhti
d0f91c5ebf
Row 1
...
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
PabstMirror
ab2ebf5fcf
MissleGuidance - Move PARAMS up to top
2015-07-03 21:06:13 -05:00
ToasterBR
f4a51d57ef
Translation to Brazilian Portuguese (PT-BR)
...
Made all remaining translations, including new ones like the sitting
module, for example.
2015-06-27 15:48:39 -03:00
PabstMirror
ce2a617c7b
#1709 - Remove ACE_Comanche_Test from zeus
2015-06-21 13:00:51 -05:00
ProfessorCZ
531372b2a3
CZ - Translation
...
Already in README
2015-06-12 14:50:50 +02:00
jonpas
541f1010a7
Merge branch 'master' into macroSTR
...
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
KoffeinFlummi
fa73aec15b
Merge https://github.com/Macusercom/ACE3 into german-merge
2015-06-01 14:27:49 +02:00
jonpas
6f6f2a55f0
Stringtable fixes except medical
2015-05-27 21:43:30 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
Ivan Navarro Cabello
047a2ee736
added spansih translate
...
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).
I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
Macusercom
7eeddfbd65
German translations
...
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00
PabstMirror
0452270380
Add Javelin CfgAmmo
...
Leave M_Titan_AT alone for A3 Vehicles / Mods that use it
2015-05-25 05:34:07 -05:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
Kavinsky
8e9b35c757
Fixed Capitalized folders on include paths
2015-05-20 23:28:10 +02:00
Glowbal
abadf05342
Merge remote-tracking branch 'gienkov/module-translations'
...
Conflicts:
addons/medical/stringtable.xml
2015-05-14 16:01:41 +02:00
Ivan Navarro Cabello
43c5afac55
fixed some spanish translation
...
I fixed some spanish translation.
2015-05-14 14:32:35 +02:00
GieNkoV
bc72c71e8e
Fix small errors inside stringtables
2015-05-12 19:11:56 +02:00
GieNkoV
5bbf875ef2
Tabs removed
...
Conflicts:
addons/missileguidance/stringtable.xml
addons/optionsmenu/stringtable.xml
2015-05-12 18:27:02 +02:00
Grzegorz Sikora
6a821715a0
Stringtable modules
...
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
PabstMirror
21552caee7
Opps- Not the same as javelin
2015-05-04 23:01:19 -05:00
PabstMirror
3fa218848d
MissleGuidance - fix Inheritance check
2015-05-04 22:46:58 -05:00
Lukas
da309e6682
Update stringtable.xml
2015-05-03 11:53:12 +02:00
ProfessorCZ
a0e443cfc6
Czech translation - Update
2015-05-03 11:48:56 +02:00
ToasterBR
021b00c722
Translation to Portuguese
...
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
licht-im-Norden87
5e8096f29c
Update Stringtable: missileguidance
2015-05-01 21:29:49 +02:00
jaynus
c1ba4966f9
Test confirm no bouncy.
2015-05-01 11:53:55 -07:00
jaynus
5bf763a08e
quote, not var.
2015-05-01 11:47:49 -07:00
jaynus
2ed05ed469
Merge remote-tracking branch 'origin/master' into laserCodeSelection
2015-05-01 11:35:11 -07:00
jaynus
dcf4f3b53e
Resolved. Conflicts:
...
addons/missileguidance/functions/fnc_onFired.sqf
2015-05-01 11:35:03 -07:00
jaynus
dfbfb4ace2
Laser code selection, hotkeys and locking. Turrets & designator, and gunner. Closes #751
2015-05-01 11:31:37 -07:00
KoffeinFlummi
e96f23c197
Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge
...
Conflicts:
addons/atragmx/stringtable.xml
addons/interact_menu/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
addons/realisticnames/stringtable.xml
addons/respawn/stringtable.xml
2015-05-01 17:30:59 +02:00
KoffeinFlummi
761e23001f
Merge https://github.com/Dimaslg/ACE3 into spanish-merge
...
Conflicts:
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/optionsmenu/stringtable.xml
2015-05-01 16:51:20 +02:00
jaynus
e4567fb59f
Merge remote-tracking branch 'origin/master' into guidanceClassFixes
...
Conflicts:
addons/javelin/functions/fnc_onOpticDraw.sqf
2015-05-01 06:59:28 -07:00
commy2
b255d1040b
scope 1 for ACE_Comanche_Test, #943
2015-05-01 15:30:11 +02:00
jaynus
21cc0db28f
Correctly look up configs.
2015-04-30 09:04:29 -07:00
Harakhti
4e165e2572
Update Hungarian translations
...
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
2015-04-30 13:25:25 +02:00
ulteq
2c97b20781
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
...
Conflicts:
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/vehiclelock/stringtable.xml
2015-04-30 13:20:31 +02:00
Dimaslg
864c3ea03b
Conflicts resolve again
...
Conflicts resolve again
2015-04-29 21:23:32 +02:00
Dimaslg
f8d5c423ae
Merge conflicts resolved
2015-04-29 21:15:22 +02:00
NukeDev
73772d9de1
Other Fixes
2015-04-29 16:44:42 +02:00
jaynus
283e34779f
Don't inherit
2015-04-29 07:05:48 -07:00
Bla1337
cfbf3bd053
Localization update
2015-04-29 11:20:21 +03:00
Josuan Albin
b5524fb3ee
French pass
...
* fixed ramp in /aircraft
* added aragmx entry
* added multiple medical entries
* translated missileguidance
* completed mk6mortar
* changed Sanitaire to Médical in realisticnames also fixed some typos
in there and had to rename some of the explosives (weren't fitting in
boxes in game)
* added myself to contributors
2015-04-28 18:00:09 +02:00
simon84
8ac6f61fcf
added some translations
...
added some translations
2015-04-28 00:36:37 +02:00
KoffeinFlummi
b472292b20
Remove tabler comments.
...
sed is awesome.
2015-04-26 21:05:41 +02:00
Dimaslg
4b7daaa840
Spanish translation
...
Minor fixes and spelling mistakes.
2015-04-25 19:18:04 +02:00
Dimaslg
274663e1b9
Spanish Translation
...
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
Nicolás Badano
1bfb13abac
Revert "remove author from items inheriting ACE_ItemCore"
2015-04-21 19:07:42 -03:00
Nicolás Badano
ce3cc71869
Merge pull request #795 from acemod/fixAuthor
...
remove author from items inheriting ACE_ItemCore
2015-04-21 15:08:53 -03:00
bux578
3897b73d56
remove author from items inheriting ACE_ItemCore
2015-04-21 19:16:54 +02:00
Ivan Navarro Cabello
55887b7cfe
updated stringtable for spanish
...
added some spanish translate
2015-04-21 19:03:55 +02:00
bux578
0d86374bee
Merge pull request #754 from gienkov/master
...
PL translation
2015-04-19 07:08:54 +02:00
PabstMirror
54c5070569
isNull
2015-04-18 22:23:19 -05:00
KoffeinFlummi
65fd6b0937
Merge https://github.com/EpMAK/ACE3 into russian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
2015-04-19 01:04:32 +02:00
jaynus
2fe7122b3e
Disable handoff until completed.
2015-04-18 15:44:07 -07:00
Grzegorz Sikora
c08125e0f3
PL translation
2015-04-18 22:00:37 +02:00
bux578
0f2e4c22b7
Merge pull request #749 from FreeZbe/master
...
French: updates / fixes stringtable
2015-04-18 21:16:07 +02:00
jaynus
953faf3d4b
ace_missileguidance privates.
2015-04-18 10:53:21 -07:00
jaynus
11336cdade
Merge remote-tracking branch 'origin/master' into guidanceHandoff
2015-04-18 10:37:16 -07:00
FreeZbe
f55bd5a629
French: updates / fixes stringtable
2015-04-18 18:49:46 +02:00
jaynus
d1e03d8e7a
Slight tweaks.
2015-04-18 09:40:46 -07:00
jaynus
e14ee45249
debug checking.
2015-04-18 09:29:58 -07:00
jaynus
d1993836ae
Cleanup. missing string.
2015-04-18 08:40:28 -07:00
EpMAK
31a2f1b279
Russian translations
...
Again, filling strings, fixing errors
2015-04-17 19:36:07 +03:00
jaynus
6c3e699fdb
tabs
2015-04-17 07:28:19 -07:00
jaynus
ce4a9c3676
Apply javelin guidance to static titans.
2015-04-16 11:32: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
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
jaynus
10cf02e856
Slower climb phase.Refs #630
2015-04-15 12:25:57 -07:00
jaynus
5bcb0ec493
Forgot to set terminal on short-range attacks. Fixes #630
2015-04-15 12:09:47 -07:00
jaynus
25b7f779f1
Difficulty magic.
2015-04-15 10:11:13 -07:00
jaynus
ea2281616e
Enable all variants of Titan. Can now vanilla-lock in cadet mode.
2015-04-15 09:55:40 -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
KoffeinFlummi
21305629ed
Merge branch 'patch-1' of https://github.com/nomisum/ACE3 into german-merge
2015-04-15 14:53:27 +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
Marco
76ff1da57a
Update stringtable.xml
...
Italian
2015-04-15 11:19:54 +02:00
jaynus
57acee0f89
Changed: Cleaned up Missile guidance setting for AI, SCALAR.
2015-04-14 19:19:14 -07: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
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
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
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
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
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
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
Grzegorz Sikora
ac886828b0
Fixes
2015-04-13 18:02:48 +02: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
Nou
b58598c6aa
Woops, missing )
2015-04-12 21:47:27 -07:00
Nou
4c74ff8717
FOV check made faster.
2015-04-12 19:49:14 -07: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
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
7f0e54b9c3
More defaults.
2015-04-12 11:43:37 -07:00
jaynus
01797fd3b9
Integarate laser code into SALH guidance + self_designate. Note todo items.
2015-04-12 11:01:22 -07:00
nomisum
ca27e6eb5a
fixed typo
...
`Erweitertes Raketenlenksystem` shoud be a nominalization
2015-04-12 19:52:37 +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
KoffeinFlummi
614afa8537
Merge https://github.com/Kllrt/ACE3 into czech-merge
...
Conflicts:
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/goggles/stringtable.xml
addons/grenades/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/nametags/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-12 14:27:59 +02:00
licht-im-Norden87
88a71042e3
Update stringtable.xml
2015-04-12 14:12:05 +02:00
Kllrt
be8ff39767
Fixed broken missileguidaince stringtable.xml
...
sry
2015-04-12 10:58:00 +02:00
PabstMirror
baf4b0146e
Missing semmicolon
2015-04-11 16:50:35 -05:00
Kllrt
38adfbcb70
Added missing CZ strings and made little revision
2015-04-11 16:33:00 +02:00
jaynus
4188893839
Move spatial model translations to ace_common
2015-04-10 14:23:55 -07:00
jaynus
8429b262f2
more debug removal, backup vanilla usage.
2015-04-10 12:40:58 -07:00
jaynus
5577a541ca
Add example.
2015-04-10 12:19:02 -07:00
jaynus
0225cb510c
Add missile strings.
2015-04-10 12:16:18 -07:00
jaynus
391b1556cb
Disable all debug.
2015-04-10 12:12:25 -07:00
jaynus
c28ac5b4a9
Compensate for target velocity.
2015-04-10 11:40:18 -07:00
jaynus
5083a5a0d2
Javelin locking fire modes were reversed.
2015-04-10 11:37:03 -07:00
jaynus
c428bf051f
placeholder model for hellfire, optics refreshing on titan
2015-04-10 10:42:02 -07:00
jaynus
2fe55b3117
Attack profile buildout.
2015-04-10 10:14:30 -07:00
jaynus
c1089dfffa
Working save, distance shots are off.
2015-04-09 16:43:05 -07:00
jaynus
2e9f6a7058
Better projected up/down.
2015-04-09 16:31:14 -07:00
jaynus
1eadcade72
Linear work javelin.
2015-04-09 15:34:42 -07:00
jaynus
8fe11c36ee
Linear altitude comparison.
2015-04-09 14:11:15 -07:00
jaynus
198d4f3540
Fixed private variable overrides and timing failure.
2015-04-09 13:03:28 -07:00
jaynus
01535c7f5c
Merge remote-tracking branch 'origin/master' into allTheMissiles
...
Conflicts:
addons/wep_javelin/config.cpp
2015-04-09 12:41:09 -07:00
jaynus
fe147c4986
Config expansion.
2015-04-09 09:39:23 -07:00
commy2
5ea35a01bb
sorting out required addons for modularity
2015-04-09 13:23:29 +02:00
jaynus
bbfd28586b
Apply ace_missileguidance to Titan. (Direct only) This is testing the extensible framework for mod makers.
2015-04-08 19:51:21 -07:00
jaynus
5a9a8d239c
Remove test parameters, timing correct. Attack profile selection working.
2015-04-08 15:52:58 -07:00
jaynus
0a1aae8553
Work save, timing correction.
2015-04-08 15:41:26 -07:00
jaynus
97230c2252
compensate for FPS lag.
2015-04-08 15:34:59 -07:00
jaynus
c89df1b04f
Dir arc created.
2015-04-08 14:51:19 -07:00
