Commit Graph

2632 Commits

Author SHA1 Message Date
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
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
Anthariel
3ee421a233 Update stringtable.xml
Wrong french translation for the line 173.
2015-04-12 18:08:06 +02:00
KoffeinFlummi
664cc7077d Reduce blood loss rate 2015-04-12 18:06:57 +02:00
KoffeinFlummi
6062128436 Remove tourniquet option, add check pulse/response 2015-04-12 18:01:29 +02:00
KoffeinFlummi
f794eaac43 Merge branch 'master' into basic-medical-tweaks
Conflicts:
	addons/medical/ACE_Medical_Actions.hpp
	addons/medical/functions/fnc_handleDamage_basic.sqf
	addons/medical/stringtable.xml
2015-04-12 18:00:22 +02:00
Anthariel
3f84ac4817 Update stringtable.xml 2015-04-12 17:59:53 +02:00
Anthariel
3842272c43 Update stringtable.xml
Fixing French & English translation error that I've made on the line : 780 and 781 (thanks KoffeinFlummi)
2015-04-12 17:55:53 +02:00
ulteq
6b44a3f3f9 Updated the module settings init script 2015-04-12 16:31:12 +02:00
ulteq
e003db2454 Fixed a typo 2015-04-12 16:27:24 +02:00
ulteq
e99fb398ae Added simulation interval setting to the ab module 2015-04-12 16:25:01 +02:00
ulteq
8f2261acdd Removed debug output 2015-04-12 16:19:39 +02:00
ulteq
ebb34a4f21 New default simulation interval of 0.05s 2015-04-12 16:19:32 +02:00
ulteq
aff9d7c554 Fixed a syntax error / Removed debug output 2015-04-12 16:17:49 +02:00
esteldunedain
d6ec8d771e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-12 11:14:31 -03:00
esteldunedain
91df52056b Only display "Surrender" action if the player is not holding a weapon. 2015-04-12 11:13:54 -03:00
ulteq
9f0a2c8b80 The terrain init script now aborts if no extension is found 2015-04-12 16:10:45 +02:00
esteldunedain
3ee18f9a3a Readd CfgModuleCategories.hpp 2015-04-12 11:06:25 -03:00
esteldunedain
e7f9245d7e ACE_Main major cleanup 2015-04-12 10:54:18 -03:00
licht-im-Norden87
fef0d690f8 Update stringtable.xml 2015-04-12 15:25:18 +02:00
licht-im-Norden87
36ba507ab5 Update stringtable.xml 2015-04-12 14:52:37 +02:00
bux578
9184ef479a add disarm icon, add action psd, move icon files 2015-04-12 14:47:08 +02:00
Glowbal
019163c9ce Merge pull request #489 from acemod/medicalPerformanceImprovements
Medical performance improvements
2015-04-12 14:44:18 +02:00
licht-im-Norden87
94eb4f3dd5 Update stringtable.xml 2015-04-12 14:42:15 +02:00
Ivan Navarro Cabello
e7a8dde782 update stringtable for spanish
added new spanish terms
2015-04-12 14:41:50 +02:00
licht-im-Norden87
38955692ff Update stringtable.xml 2015-04-12 14:40:04 +02:00
licht-im-Norden87
dbc7026d94 ..... 2015-04-12 14:38:04 +02:00
licht-im-Norden87
b144a42e63 Update stringtable.xml 2015-04-12 14:30:40 +02:00
Legolasindar
2c0e93271c Update stringtable.xml
added spanish translate
2015-04-12 14:29:47 +02:00
KoffeinFlummi
8f2a1735ae Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-12 14:28:28 +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
Legolasindar
4bb9f0cf77 Update stringtable.xml
added spanish translate
2015-04-12 14:27:42 +02:00
licht-im-Norden87
a04abcf972 Update stringtable.xml 2015-04-12 14:25:41 +02:00
FreeZbe
45ff6c7ce9 French: (Nearly) Complete French translations
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
2015-04-12 14:15:45 +02:00
licht-im-Norden87
400b8f4270 Update stringtable.xml 2015-04-12 14:14:48 +02:00
licht-im-Norden87
8f88158a2e Update stringtable.xml 2015-04-12 14:13:38 +02:00
licht-im-Norden87
88a71042e3 Update stringtable.xml 2015-04-12 14:12:05 +02:00
licht-im-Norden87
a3f97efbc3 Update stringtable.xml
What does WDG and MGRS mean?
2015-04-12 14:07:49 +02:00
licht-im-Norden87
e4ec9d14d4 Update stringtable.xml 2015-04-12 14:00:56 +02:00
licht-im-Norden87
15e9b2cccc Update stringtable.xml 2015-04-12 13:59:09 +02:00
Legolasindar
b665781399 Update stringtable.xml
updated spanish translation and added some english missed translation
2015-04-12 13:58:06 +02:00
licht-im-Norden87
6b39edbddf Update stringtable.xml 2015-04-12 13:58:02 +02:00
commy2
56de4f05f3 scripts for vector illum, renaming some files 2015-04-12 13:56:01 +02:00
licht-im-Norden87
a01c4a0e0b Update stringtable.xml 2015-04-12 13:55:55 +02:00
licht-im-Norden87
2222192aee Update stringtable.xml 2015-04-12 13:51:47 +02:00
licht-im-Norden87
7eaee37ff6 Update stringtable.xml 2015-04-12 13:48:59 +02:00
licht-im-Norden87
d0fb387255 Update Stringtable: Disarming 2015-04-12 13:45:47 +02:00
nic547
0f1115c33b Added new Ammotypes into the AGM crate 2015-04-12 13:08:50 +02:00
commy2
83e634be8a illuminate vector number textures at night 2015-04-12 12:54:36 +02:00
ulteq
9fd19563a3 Fixed several syntax errors 2015-04-12 12:52:13 +02:00
ulteq
fd737f3f95 Minor code optimization 2015-04-12 12:36:05 +02:00
ulteq
cf88adb794 Replaced wind with ACE_wind 2015-04-12 12:34:42 +02:00
ulteq
85a7bea42b Added wind deflection module settings:
*simulationInterval
*simulationRadius
2015-04-12 12:33:09 +02:00
ulteq
a993f2d5f1 Minor code optimization 2015-04-12 12:15:39 +02:00
ulteq
cb0df8783a Fixed a calculation error 2015-04-12 12:09:55 +02:00
commy2
7b0e7a1efb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-12 12:04:07 +02:00
commy2
f16d5398f4 enable vector on ffv positions, fix #506 2015-04-12 12:03:49 +02:00
ulteq
1c8da72716 Removed debug output 2015-04-12 11:59:45 +02:00
ulteq
879c6b42b9 Finished the advanced ballistics module settings 2015-04-12 11:59:02 +02:00
ulteq
c532742a5b Overworked the module settings (WIP) 2015-04-12 11:48:21 +02:00
commy2
e87f491470 mute implementation in noradio, handle post init on remote units 2015-04-12 11:17:58 +02:00
Kllrt
be8ff39767 Fixed broken missileguidaince stringtable.xml
sry
2015-04-12 10:58:00 +02:00
commy2
54f29d75f5 functions to mute unit 2015-04-12 10:05:49 +02:00
Glowbal
6bfd3e5c74 Merge pull request #481 from acemod/FixUnconciousAnimWhileCarrying
Fixed breaking of unconscious animation on drop object.
2015-04-12 09:48:27 +02:00
commy2
018854a7c3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into muteunit 2015-04-12 09:15:45 +02:00
PabstMirror
78b64ea273 Missing English 2015-04-12 01:36:41 -05:00
bux578
2fc7f44c39 french translation, tabler 4 spaces test 2015-04-12 07:50:23 +02:00
bux578
0e3d971274 Fix translations error 2015-04-12 07:46:43 +02:00
esteldunedain
dfea99debf Switch "Team" for "Group" 2015-04-12 01:32:03 -03:00
esteldunedain
0565eb6c74 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into linearMenuExperiment
Conflicts:
	addons/laser_selfdesignate/stringtable.xml
2015-04-12 01:26:55 -03:00
esteldunedain
654ab4daf5 Remove >> from attach actions 2015-04-12 01:24:42 -03:00
esteldunedain
0420a94938 Streamline Team management actions 2015-04-12 01:19:38 -03:00
esteldunedain
630a2a0f7a Make the list menu optional via a client setting 2015-04-12 01:15:38 -03:00
esteldunedain
01bc6b233a Merge branch 'breakLineExtension' into linearMenuExperiment
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
2015-04-12 00:21:05 -03:00
esteldunedain
7b797d906f Merge branch 'master' into linearMenuExperiment
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
	addons/overheating/stringtable.xml
2015-04-12 00:19:33 -03:00
Nou
40c5de8cfb Reduce default number of rays, make it an argument for shootCone. Accuracy is still the same with 3 to 8, just better FPS. Rangefinders should probably use a higher number (8 is good, 24+1 rays in total per shot). 2015-04-11 20:14:03 -07:00
Nou
db3f816843 Reduce default number of rays, make it an argument for shootCone. Accuracy is still the same with 3 to 8, just better FPS. Rangefinders should probably use a higher number (8 is good, 24+1 rays in total per shot). 2015-04-11 20:13:52 -07:00