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,044 Commits 73 Branches 88 Tags 752 MiB
3c4a3c67db
Commit Graph

2738 Commits

Author SHA1 Message Date
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
PabstMirror
18cd0e7f39 Use DisableAI from common 2015-04-11 21:48:12 -05:00
PabstMirror
c3c815db8d Better LOS check 2015-04-11 21:42:57 -05:00
esteldunedain
df17df61f9 Improve the way lines are split 2015-04-11 23:39:06 -03:00
KoffeinFlummi
59952441d8 Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-12 06:22:17 +02:00
KoffeinFlummi
362753209e Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-12 05:40:24 +02:00
KoffeinFlummi
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00
KoffeinFlummi
5108137302 Merge https://github.com/Ricciardino/ACE3 into italian-merge 2015-04-12 04:38:46 +02:00
PabstMirror
8fc3b53507 Use new medical func 2015-04-11 21:22:34 -05:00
PabstMirror
3be70556ab Medical: adjustPainLevels from outside functions 2015-04-11 21:21:33 -05:00
KoffeinFlummi
5101a21beb Remove "Original" stringtable entries 2015-04-12 04:21:06 +02:00
Nou
e4c459132b Merge branch 'master' into network_lasers 2015-04-11 18:36:57 -07:00
Nou
8386c0e22a Seeker system and network enabled laser simulation. 2015-04-11 18:36:10 -07:00
licht-im-Norden87
a30eabfb1d Update stringtable.xml 2015-04-12 03:30:11 +02:00
licht-im-Norden87
bd673d3374 Update stringtable.xml 2015-04-12 03:28:12 +02:00
licht-im-Norden87
bd07e18b43 Update stringtable.xml 2015-04-12 03:26:45 +02:00
esteldunedain
d06e1b4a2a Break line extension 2015-04-11 22:22:19 -03:00
PabstMirror
350a79c8a4 #498 - Use cursor mode when scoped 2015-04-11 19:44:42 -05:00
Felix Wiegand
0531f2cc12 Merge pull request #493 from FreeZbe/patch-7 
Update stringtable.xml
 2015-04-12 01:14:40 +02:00
esteldunedain
a01864319a Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-11 19:34:53 -03:00
esteldunedain
488000bdf3 Rename "Check Temperature" to "Check Weapon Temperature" and move it inside the equipment submenu. Close #494 2015-04-11 19:34:29 -03:00
PabstMirror
baf4b0146e Missing semmicolon 2015-04-11 16:50:35 -05:00
PabstMirror
0805d5b640 Update UAV battery icon from AGM 2015-04-11 16:48:49 -05:00
ulteq
ef0884c49d Added comments to all ATragMX functions 2015-04-11 23:40:46 +02:00
FreeZbe
3ff6abde71 Update stringtable.xml 2015-04-11 23:18:51 +02:00
jaynus
2a2f96a034 ACRE API functions and core functions were incorrect. 2015-04-11 14:10:30 -07:00
jaynus
458c49b0a7 Merge remote-tracking branch 'origin/master' into javelinLocking 
Conflicts:
	addons/common/XEH_preInit.sqf
 2015-04-11 14:01:47 -07:00
jaynus
6e28b3b9b7 Disable gates (reload) 2015-04-11 13:59:17 -07:00
jaynus
d744074b2f localization. 2015-04-11 13:48:46 -07:00
Glowbal
e00f0ea4c3 No longer creates a new waitAndExec for every handleDamage call 2015-04-11 22:47:10 +02:00
jaynus
2418d99f97 Finalizes port. Closes #75 2015-04-11 13:41:00 -07:00
jaynus
75216c2f8b readme, authors. 2015-04-11 13:39:16 -07:00
jaynus
2999ff55e1 Working javelin targeting and gating. Still has red center target optic because I cant do optic p3d's. TODO: We need an optic p3d. 2015-04-11 13:37:55 -07:00
ulteq
05f14d6242 Added AdvancedBallistics module options 2015-04-11 22:34:19 +02:00
Glowbal
97fa40b4c1 Make use of new global variables for selections and hitpoints 2015-04-11 22:31:38 +02:00
Glowbal
6cc115a628 We already determine the new damage in caching, so we will use that value instead of recalculating it here 2015-04-11 22:31:17 +02:00
Glowbal
e8d2a00994 Added GVAR(HITPOINTS) and GVAR(SELECTIONS) variables 
No longer have to recreate the selection and hitpoint arrays every time
 2015-04-11 22:30:52 +02:00
Glowbal
c69f71ba71 formatting 2015-04-11 22:29:32 +02:00
Glowbal
51906e341d Removed unused variables 2015-04-11 22:29:11 +02:00
jaynus
505005891d Remove debug, targeting constraints working. 2015-04-11 12:42:30 -07:00
Glowbal
082ab5155e Minor performance improvements 
Before avg: 0.0858495ms
After avg: 0.0701045ms
 2015-04-11 21:27:49 +02:00
PabstMirror
f5cce94b91 Merge pull request #136 from acemod/disarmingTest 
Unit Disarming/DropGear Merge
 2015-04-11 14:14:22 -05:00
ulteq
e108598b36 Added a model for the ATragMX 2015-04-11 21:01:38 +02:00
nic547
63e5247d3b more ammotypes for the mags 2015-04-11 21:00:41 +02:00
EpMAK
21abff3713 Revert "Revert "Russian Translation"" 
This reverts commit ea04f4ab3e.
 2015-04-11 21:33:34 +03:00
EpMAK
ea04f4ab3e Revert "Russian Translation" 
This reverts commit 17a552bb80.
 2015-04-11 21:33:07 +03:00
Glowbal
66bd7e7e5f fixed #457 2015-04-11 20:32:07 +02:00
commy2
b9077888aa unmute handleing 2015-04-11 20:26:43 +02:00
jaynus
458958ef09 Target gating implemented. 2015-04-11 11:17:34 -07:00
jaynus
aa53a1815c scaling. 2015-04-11 10:58:27 -07:00
jaynus
fb6c99d69b re-path. Wtf safezones. 2015-04-11 10:56:58 -07:00
ulteq
5c5f41cf5b AB is now disable by default 2015-04-11 19:51:58 +02:00
ulteq
9893d940df Disabled advanced scope zeroing if AB is not enabled 2015-04-11 19:47:14 +02:00
ulteq
1ff7218903 Change the Kestrel 4500 behavior 'back to normal' when AB is disabled 2015-04-11 19:44:38 +02:00
jaynus
efaee770bb rename wep_javelin to javelin 2015-04-11 10:44:13 -07:00
Kllrt
12f87013b2 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-11 19:38:28 +02:00
ulteq
2b0a0145c5 Removed the last spawn/sleep commands from AB 2015-04-11 18:39:15 +02:00
Felix Wiegand
0bf32bfb3a Merge pull request #476 from acemod/dropbackpack 
function to drop backpack
 2015-04-11 18:23:27 +02:00
commy2
e1bf475355 Merge pull request #419 from acemod/cfgtriggers 
rename cfgAce_Triggers to ACE_Triggers
 2015-04-11 18:19:36 +02:00
ulteq
44198b18d7 Rewrite of the terrain initialization: 
*Replaced spawn/sleep with a PFH
 2015-04-11 18:18:38 +02:00
commy2
4dc38ca7ee Merge pull request #395 from acemod/flashsup 
flashsupressors for new weapons, #264
 2015-04-11 18:18:05 +02:00
Kllrt
56681e632d Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-11 16:36:31 +02:00
Kllrt
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
commy2
761e4aec64 edit description 2015-04-11 16:27:04 +02:00
esteldunedain
dec5aa3ec5 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-11 11:12:56 -03:00
esteldunedain
b8e0388581 Fix nearestObjects with getPos choking over seawater. Fix #465 2015-04-11 11:12:40 -03:00
commy2
62b45a8a07 initial commit 2015-04-11 15:59:21 +02:00
commy2
9cf44b1d32 initial commit 2015-04-11 15:46:41 +02:00
ulteq
23733263ea Updated the extension file name 2015-04-11 15:06:30 +02:00
nic547
a37cd51fe7 more stuff 
- added more ammotypes
- stringtable now follows guideline
 2015-04-11 15:02:56 +02:00
ulteq
d7a40bfba2 Replaced all execVM calls with FUNC() 2015-04-11 14:51:40 +02:00
ulteq
a36bd588d5 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments 2015-04-11 14:31:23 +02:00
ulteq
fee65cd56f Overhauled the scope adjustment module: 
*Added configs for the new marksmen scopes
*Introduced minor and major steps
*Introcuded a new increment config (ACE_ScopeAdjust_Increment)
*Changed the default zero range to 100m
*Added a zero reference setting
*Added an interaction menu entry to update the zero reference setting
 2015-04-11 14:02:44 +02:00
commy2
5a5a1fd66a ACE_optic_SOS_PIP - iron sight was missing, fix #470 2015-04-11 13:18:45 +02:00
PabstMirror
787df67248 Merge branch 'master' into disarmingTest 2015-04-10 19:20:34 -05:00
jaynus
4188893839 Move spatial model translations to ace_common 2015-04-10 14:23:55 -07:00
jaynus
0a88220fc2 Constraints work, added worldToScreenBounds to common. 2015-04-10 14:20:06 -07:00
jaynus
721898d9fb Constraint dialogs working. 2015-04-10 13:57:44 -07:00
commy2
11ad74735c Merge pull request #458 from Tenga/master 
Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera
 2015-04-10 22:12:55 +02:00
PabstMirror
adc7db9ae9 #456 - Fix AI rotating while dead (disableAI func) 
Still some small head movements, but I don't know how to fix that.
 2015-04-10 15:02:40 -05:00
Tenga
b710c2543e Return the newline to fnc_externalCamera.sqf 2015-04-10 21:59:28 +02:00
commy2
2a72e183b1 Merge pull request #450 from Tenga/master 
Count the commander camera as a 3rd person camera
 2015-04-10 21:54:52 +02:00
Tenga
229590ed20 Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera 2015-04-10 21:54:47 +02:00
Tenga
c8cff6e91c - Added isFeatureCameraActive to ace_common 
- ace_goggles_fnc_externalCamera now checks for cameras made by a BI feature
 2015-04-10 21:48:24 +02:00
jaynus
83b453a294 Merge pull request #379 from acemod/allTheMissiles 
Merging for current builds needing at least better guidance and fixed locking modes. Also allowing for mod-makers to see and utilize the new locking framework.
 2015-04-10 12:48:10 -07:00
jaynus
8429b262f2 more debug removal, backup vanilla usage. 2015-04-10 12:40:58 -07:00
PabstMirror
661ddc3562 #441 - Crash with no model on ace_fakeweapon 2015-04-10 14:35:08 -05:00
FreeZbe
4a996bf147 Update stringtable.xml 2015-04-10 21:22:07 +02:00
esteldunedain
ee8af7f153 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-10 16:21:27 -03:00
esteldunedain
d6e70cfe6b Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3 
Conflicts:
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/frag/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-10 16:20:18 -03:00
FreeZbe
e09a3b29d7 Update stringtable.xml 2015-04-10 21:20:09 +02: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
Riccardo Petricca
d9e78e511e Added italian translation to the last terms. 
Added italian translation to the last added terms.
 2015-04-10 21:13:03 +02:00
jaynus
391b1556cb Disable all debug. 2015-04-10 12:12:25 -07:00
FreeZbe
4dbba270f9 Translations fixes 2015-04-10 21:07:38 +02:00
nic547
a4b9090e34 Added new ammotypes for both types of .388 ammo 2015-04-10 21:01:49 +02:00
jaynus
bcb7d18e7e remove debug. 2015-04-10 11:57:50 -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
ruPaladin
8ea96b3086 Update stringtable.xml 2015-04-10 21:21:40 +03:00
ulteq
127d100628 Overworked the scope adjustment keybinds: 
*Fixed duplicate actionIDs
*Introduced minor/major steps
*Reset the stringtable.xml
 2015-04-10 20:17:26 +02:00
PabstMirror
db5861da52 #428 - GJ Git 2015-04-10 13:05:39 -05:00
PabstMirror
33570c94e4 #428 - Only work on locked vehicles. 2015-04-10 13:05:39 -05:00
Tenga
eec5f458db Count the commander camera as a 3rd person camera 2015-04-10 20:05:33 +02:00
PabstMirror
97e277d710 #448 - Adjust Nightvision in vehicles 2015-04-10 12:55:42 -05:00
jaynus
c428bf051f placeholder model for hellfire, optics refreshing on titan 2015-04-10 10:42:02 -07:00
esteldunedain
b44f22c262 Add 1 mil scope adjustment keybinds 2015-04-10 14:41:34 -03:00
ruPaladin
d198cb25e9 Update stringtable.xml 2015-04-10 20:37:21 +03:00
commy2
ec29cdd731 remove forgotten debug item, .MD for optics, fix #439 2015-04-10 19:34:44 +02:00
ruPaladin
9c8c38aaae Update stringtable.xml 2015-04-10 20:28:05 +03:00
ruPaladin
a3a40a711c Update stringtable.xml 2015-04-10 20:24:23 +03:00
ruPaladin
100954da06 Update stringtable.xml 2015-04-10 20:19:19 +03:00
jaynus
2fe55b3117 Attack profile buildout. 2015-04-10 10:14:30 -07:00
commy2
5d097c4dd9 add comment explaining why isNumber is used 2015-04-10 19:11:51 +02:00
ulteq
2c4c6763c3 Removed deprecated CSE code (EnableForAI module option) 2015-04-10 19:02:32 +02:00
EpMAK
17a552bb80 Russian Translation 
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
 2015-04-10 19:55:57 +03:00
EpMAK
68d08b8c7b Revert "Translation" 
This reverts commit fab5605ad5.
 2015-04-10 19:46:18 +03:00
commy2
c03ee8e9c6 lowercase gps 2015-04-10 18:34:26 +02:00
commy2
dc49f2c71e rewrite assigned item fix 2015-04-10 18:31:43 +02:00
FreeZbe
31a08d22d8 Translation changes 2015-04-10 18:18:45 +02:00
ulteq
9604699f26 Replaced QUOTE(GVAR(...)) with QGVAR(...) 2015-04-10 18:11:01 +02:00
ulteq
4e50760064 Fixed a syntax error 2015-04-10 18:08:38 +02:00
commy2
5ff1d9863d remove +2 offset for check temperature, also fix the shade of grey, #431 2015-04-10 17:48:21 +02:00
commy2
fc98e78a53 hide check temperature action when empty weapon is selected, #431 2015-04-10 17:36:58 +02:00
FreeZbe
62bb1c6907 Translation changes 2015-04-10 17:11:15 +02:00
FreeZbe
6de5cd76dc Translation changes 2015-04-10 17:10:51 +02:00
commy2
c7ad94efbf renamed hpp to ACE_Triggers 2015-04-10 17:09:48 +02:00
commy2
5c12b22666 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into cfgtriggers 2015-04-10 17:07:47 +02:00
Grzegorz
584c77a0b6 microdagr PL translation 
fixes
 2015-04-10 17:07:40 +02:00
EpMAK
fab5605ad5 Translation 
Russian translation of the texts
 2015-04-10 17:51:48 +03:00
ulteq
37804f01f6 Fixed a nasty typo 2015-04-10 16:48:58 +02:00
ulteq
013c56f070 Replaced an outdated ATragMX 'AdvancedBallistics detection routine' 2015-04-10 16:48:45 +02:00
FreeZbe
3541500947 Translation changes 2015-04-10 16:41:51 +02:00
Grzegorz
a95b0b051c inventory PL translation 2015-04-10 16:33:09 +02:00
Grzegorz
439dfa7b3c laser_selfdesignate PL translation 
fixes
 2015-04-10 16:31:47 +02:00
FreeZbe
8fc73af1c4 Translation update 
Addition of french translation
 2015-04-10 16:26:09 +02:00
ulteq
6d40859ec2 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 
Conflicts:
	addons/kestrel/config.cpp
 2015-04-10 15:51:22 +02:00
ulteq
87406d739d Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-10 15:49:14 +02:00
ulteq
ad8e6450eb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-10 15:44:33 +02:00
ulteq
f07d743c1d Fixed Kestrel4500 not working when bipod is deployed 2015-04-10 15:26:56 +02:00
ulteq
25ec665f45 Fixed the ATragMX 'AdvancedBallistics detection routine' 2015-04-10 15:17:16 +02:00
ulteq
ad3c9493d7 Fixed ATragMX not working when bipod is deployed 2015-04-10 15:09:38 +02:00
ulteq
c7db3dbffe Renamed canShow function to fit the rest of the functions 2015-04-10 15:09:18 +02:00
ulteq
f003ff590e Fixed the target speed assist feature: 
*Replaced while/sleep with a PFH
 2015-04-10 15:02:45 +02:00
Asgar
16b2311376 Added German translation for a couple of things, 2015-04-10 14:21:55 +02:00
Legolasindar
c7d3618d79 Update stringtable.xml 
fix spanish term
 2015-04-10 13:43:39 +02:00
Legolasindar
a224ec3371 Update stringtable.xml 
added spanish translation
 2015-04-10 13:43:07 +02:00
Legolasindar
f2a73ab9c6 Update stringtable.xml 
added some spanish translation
 2015-04-10 13:41:44 +02:00
Legolasindar
19da5b366e Update stringtable.xml 
added spanish translation
 2015-04-10 13:38:19 +02:00
Legolasindar
c741154ff2 Update stringtable.xml 
added spanish translation
 2015-04-10 13:36:17 +02:00
Legolasindar
6f69361a73 Update stringtable.xml 
added spanish translation
 2015-04-10 13:34:16 +02:00
Legolasindar
470a12ed46 Update stringtable.xml 
added spanish translation
 2015-04-10 13:19:26 +02:00
Legolasindar
a73c37ce05 Update stringtable.xml 
added spanish translation
 2015-04-10 13:14:33 +02:00
Legolasindar
e0fc44cfa8 Update stringtable.xml 
Added spanishtr translation
 2015-04-10 13:04:08 +02:00
ulteq
f7944381af Updated the .50 Cal airFriction values 2015-04-10 13:00:08 +02:00
Legolasindar
cf769e09fb Update stringtable.xml 
Add spanish translation
 2015-04-10 12:46:31 +02:00
ulteq
8f6bf930ee Added gun profiles for the new vanilla calibers 2015-04-10 12:41:29 +02:00
Legolasindar
52d476abd3 Update stringtable.xml 
Added spanisth translation, and two lines of english translation
 2015-04-10 12:29:44 +02:00
ulteq
bbfafdb5e1 Added missing private variable declaration 2015-04-10 11:43:47 +02:00
ulteq
77d39016fa Fixed an issue with zero ranges close to 0 meters. 2015-04-10 11:14:13 +02:00
Jo David
c258c6c00d fixing translation 2015-04-10 09:05:37 +02:00
Jo David
33a14076fc Merge branch 'master' of https://github.com/acemod/ACE3 into translations 
Conflicts:
	addons/captives/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-10 09:01:24 +02:00
jaynus
6286d59bd9 Remove NVG from gunner optics on comanche. 2015-04-09 23:29:37 -07:00
jaynus
9e7d4c25bb Removes old value of stabalizing which broke gunner. Fixes #412 2015-04-09 23:28:41 -07:00
commy2
d5f190dff8 fix: getGunner returns null object when throwing grenades, planting explosives 2015-04-10 06:47:31 +02:00
commy2
105184ce88 fix: getGunner returns null object if pilot uses manual fire if no gunner is present 2015-04-10 06:36:09 +02:00
Anthariel
04bf321099 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:31:42 +02:00
Anthariel
81122e0839 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:30:49 +02:00
Anthariel
b5841f8f09 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:28:59 +02:00
Anthariel
dd8f9cd8d6 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:27:04 +02:00
Anthariel
0191abc529 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:25:05 +02:00
Anthariel
523417ba3c Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:23:13 +02:00
Anthariel
0c851a6d9a Update stringtable.xml 
Added: French Translations (100%)
 2015-04-10 06:22:26 +02:00
Anthariel
95e53fd1bf Update stringtable.xml 
Added: French Translations (~85%)
 2015-04-10 06:20:04 +02:00
Anthariel
d6b2d13a72 Update stringtable.xml 
Added: French Translation (95%)
 2015-04-10 06:00:22 +02:00
commy2
5fe33fb1db rename cfgAce_Triggers to ACE_Triggers 2015-04-10 05:56:19 +02:00
Anthariel
0d8145073f Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:54:45 +02:00
Anthariel
627f8fb41b Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:53:29 +02:00
Anthariel
87f5873c2a Update stringtable.xml 
Added: French Translation (90%)
Fixed: Uknow to Unknow (line 101)
 2015-04-10 05:50:08 +02:00
PabstMirror
26d282c224 Explosives: Fix cursor interaction menu breaking 2015-04-09 22:46:19 -05:00
Anthariel
fb8c49135e Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:43:42 +02:00
Anthariel
d9986c6959 Update stringtable.xml 
Added: French Translation (75%)
 2015-04-10 05:40:22 +02:00
Anthariel
7280148f91 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:37:10 +02:00
Anthariel
949cee6df4 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:35:56 +02:00
Anthariel
e6adddb7fa Update stringtable.xml 
Added: French Translations (100%)
 2015-04-10 05:34:09 +02:00
Anthariel
29f06a7bd8 Update stringtable.xml 
Added: French Translation (100%).
 2015-04-10 05:29:00 +02:00
PabstMirror
170985295d Flashbangs: Medical Pain 2015-04-09 22:00:03 -05:00
PabstMirror
eb60910aab Flashbangs: eyePos LOS check, 3d eye direction 2015-04-09 21:58:45 -05:00
Kavinsky
a118cae13d unified ACE_Attachable config entry now ACE_Attachable its a string and hold the effect for the item 2015-04-10 04:36:28 +02:00
Kavinsky
b49fec58e6 Updated stringtable 2015-04-10 04:35:21 +02:00
Grzegorz
311e018ba7 weaponselect PL translation 2015-04-10 04:33:13 +02:00
Grzegorz
bf6984400f medical PL translation 
like a boss
 2015-04-10 04:30:39 +02:00
Kavinsky
adaee74a57 removed config redundancy 2015-04-10 04:00:26 +02:00
Kavinsky
999ad49fd0 removed duplicated debugging error 2015-04-10 03:58:14 +02:00
Grzegorz
3ffd7ac8c7 attach PL translation 2015-04-10 03:57:55 +02:00
Grzegorz
37be4f9e53 captives PL translation 2015-04-10 03:56:24 +02:00
Grzegorz
95be641918 common PL translation 2015-04-10 03:52:30 +02:00
Kavinsky
049edd1483 Added ACE Attach posibility to add more types of attachable items 2015-04-10 03:49:50 +02:00
Grzegorz
dcc07c84bc disposable PL translation 2015-04-10 03:43:34 +02:00
Grzegorz
6be80caf2e dragging PL translation 2015-04-10 03:41:12 +02:00
Grzegorz
d0787ab2d8 explosives PL translation 2015-04-10 03:40:03 +02:00
Grzegorz
ae1b2f04b0 fcs PL translation 2015-04-10 03:39:05 +02:00
Grzegorz
022e17417f frag PL translation 2015-04-10 03:37:30 +02:00
Grzegorz
2925100ec6 frag PL translation 2015-04-10 03:36:32 +02:00
Grzegorz
d874140268 hearing PL translation 2015-04-10 03:33:40 +02:00
Grzegorz
e907553abc interact_menu PL translation 2015-04-10 03:28:14 +02:00
Grzegorz
2984aa2e8c interaction PL translation 2015-04-10 03:26:03 +02:00
Grzegorz
aaa4dcba2c inventory PL translation 2015-04-10 03:19:37 +02:00
Grzegorz
e13199af2a laser_selfdesignate PL translation 2015-04-10 03:15:28 +02:00
Grzegorz
8b6ac39d1d laserpointer PL translation 2015-04-10 03:13:59 +02:00
Grzegorz
e0a2a144c5 logistics_wirecutter 2015-04-10 03:10:05 +02:00
Grzegorz
685d21169d magazinerepack PL translation 
Had to make some shifts in lines 70 and 93 to make it sound good in PL
 2015-04-10 03:03:03 +02:00
Grzegorz
6cbb6206c1 microdagr PL translation 
fixed typo in line 119
 2015-04-10 02:47:19 +02:00
Grzegorz
0f9614eb4f nametags PL translation 
SoundWaves :)
 2015-04-10 02:36:23 +02:00
Nicolás Badano
357fd1969b Merge pull request #406 from Legolasindar/patch-4 
Spanish: Update stringtable.xml
 2015-04-09 21:24:19 -03:00
Nicolás Badano
7e6e0d0ecd Merge pull request #402 from Legolasindar/patch-2 
Update stringtable.xml
 2015-04-09 21:24:00 -03:00
Grzegorz
5255c91408 optionsmenu PL translation 2015-04-10 02:20:22 +02:00
Grzegorz
03faa32cef overheating PL translation 2015-04-10 02:07:19 +02:00
Grzegorz
d193fd513f realisticnames PL translation 2015-04-10 02:02:59 +02:00
Grzegorz
a150ab43e1 Update stringtable.xml 2015-04-10 01:53:28 +02:00
Grzegorz
f61832f735 reload PL translation 2015-04-10 01:44:43 +02:00
jaynus
c1089dfffa Working save, distance shots are off. 2015-04-09 16:43:05 -07:00
Legolasindar
2a5e416dfc Update stringtable.xml 
fixed spanish terms
 2015-04-10 01:40:22 +02:00
Legolasindar
e63b9c7aa9 Update stringtable.xml 
added spanish translation
 2015-04-10 01:38:31 +02:00
Grzegorz
ce46961ef1 reloadlaunchers PL translation 2015-04-10 01:38:13 +02:00
Legolasindar
2456660867 Update stringtable.xml 2015-04-10 01:36:42 +02:00
Grzegorz
08590d98a3 respawn PL translation 2015-04-10 01:35:09 +02:00
Legolasindar
5a849fe8a4 Update stringtable.xml 
added spanish translation
 2015-04-10 01:33:08 +02:00
jaynus
2e9f6a7058 Better projected up/down. 2015-04-09 16:31:14 -07:00
Legolasindar
2542f994d6 Update stringtable.xml 
added spanish translation
 2015-04-10 01:29:52 +02:00
Grzegorz
aa8275460f weaponselect PL translation 2015-04-10 01:29:26 +02:00
Legolasindar
5f5ce47bec Update stringtable.xml 
fixed one term in spanish
 2015-04-10 01:26:06 +02:00
Grzegorz
df3927324a wep_javelin PL translation 2015-04-10 01:24:58 +02:00
Legolasindar
65b3566d41 Update stringtable.xml 
fixed spanish terms.
 2015-04-10 01:24:37 +02:00
Legolasindar
b8b151e62e Update stringtable.xml 
added spanish terms
 2015-04-10 01:20:39 +02:00
Clon1998
d7bdb48547 Update stringtable.xml 2015-04-10 01:15:20 +02:00
Legolasindar
df31442599 Update stringtable.xml 
added spanish terms
 2015-04-10 01:13:33 +02:00
Legolasindar
dc44b73a36 Update stringtable.xml 
updated spanish terms
 2015-04-10 01:12:31 +02:00
licht-im-Norden87
852f939430 whoops 2015-04-10 01:00:35 +02:00
Legolasindar
ed87e53c80 Update stringtable.xml 
Updated spanish terms.
 2015-04-10 00:48:51 +02:00
licht-im-Norden87
620d458cab Update stringtable.xml 2015-04-10 00:45:37 +02:00
licht-im-Norden87
7221042d7c Update stringtable.xml 2015-04-10 00:43:30 +02:00
licht-im-Norden87
7e78a7de18 Reload 2015-04-10 00:41:39 +02:00
licht-im-Norden87
fb5189be9a Overheating 2015-04-10 00:38:51 +02:00
Legolasindar
cef9a6454a Update stringtable.xml 
Updated spanish terms, on moved english to first raws.
 2015-04-10 00:38:24 +02:00
licht-im-Norden87
88336753d0 optionsmenu 2015-04-10 00:36:41 +02:00
jaynus
1eadcade72 Linear work javelin. 2015-04-09 15:34:42 -07:00
licht-im-Norden87
c18f7cafa6 Update stringtable.xml 2015-04-10 00:34:04 +02:00
licht-im-Norden87
03aa01c354 Update stringtable.xml 2015-04-10 00:31:52 +02:00
licht-im-Norden87
fbe214db74 Not yet completed 2015-04-10 00:29:45 +02:00
licht-im-Norden87
9cca9dbd80 Update stringtable.xml 2015-04-10 00:23:49 +02:00
licht-im-Norden87
6323a85f17 Update stringtable.xml 
<English>Field Dressing</English>
        <German>Notverband</German>
I dont know if a Notverband is the same as a Field Dressing.
 2015-04-10 00:23:20 +02:00
PabstMirror
c511431e61 Fix encoding problem 
Not sure why, but it was decoding the \a's: Warning:
z\ace\addons\main\config.cpp Line 556: ['MAIN',_this] execVM
'\zceddons\mainbout.sqf';-NOGIT
 2015-04-09 17:17:33 -05:00
Legolasindar
1dcbebc04c Update stringtable.xml 
Updated spanish terms
 2015-04-10 00:10:47 +02:00
Felix Wiegand
309eb7b3bf Merge pull request #399 from licht-im-Norden87/patch-1 
Stringtable: German additions
 2015-04-10 00:06:43 +02:00
Legolasindar
7b4d62c46c Update stringtable.xml 
Fixed spanish terms
 2015-04-10 00:05:47 +02:00
licht-im-Norden87
4522b45939 Update stringtable.xml 2015-04-10 00:03:46 +02:00
licht-im-Norden87
7f54ec34b6 Update stringtable.xml 2015-04-09 23:53:15 +02:00
licht-im-Norden87
1dc56cb1af Update stringtable.xml 2015-04-09 23:48:58 +02:00
licht-im-Norden87
7994441968 Update stringtable.xml 2015-04-09 23:48:21 +02:00
licht-im-Norden87
7d71d360b0 Update stringtable.xml 
Not quite convinced by my translation ... Flummi you better have a look
 2015-04-09 23:45:33 +02:00
licht-im-Norden87
2373e78245 Update stringtable.xml 2015-04-09 23:43:58 +02:00
licht-im-Norden87
828e19a268 Update stringtable.xml 2015-04-09 23:42:45 +02:00
licht-im-Norden87
2097a5f213 Update stringtable.xml 2015-04-09 23:42:15 +02:00
licht-im-Norden87
0986eb427d Update stringtable.xml 2015-04-09 23:41:10 +02:00
licht-im-Norden87
2304b46e2f Update stringtable.xml 2015-04-09 23:39:48 +02:00
licht-im-Norden87
a6f8e05cb8 Update stringtable.xml 2015-04-09 23:37:26 +02:00
licht-im-Norden87
ecf5eef638 Update stringtable.xml 2015-04-09 23:36:21 +02:00
licht-im-Norden87
3c4656522f Stringtable: German additions 2015-04-09 23:33:36 +02:00
licht-im-Norden87
00c37e0b9d Update stringtable.xml 2015-04-09 23:12:00 +02:00
jaynus
8fe11c36ee Linear altitude comparison. 2015-04-09 14:11:15 -07:00
licht-im-Norden87
2c7df9da6a Stringtable: German additions 2015-04-09 23:02:28 +02:00
Glowbal
84c8e02328 Merge pull request #396 from KoffeinFlummi/medicalCleanup 
Medical cleanup
 2015-04-09 22:13:31 +02:00
jaynus
198d4f3540 Fixed private variable overrides and timing failure. 2015-04-09 13:03:28 -07:00
PabstMirror
253614d442 Explosives: cancel placement when opening interact 
"zoomtemp" doesn't work for me, so this gives an additional way to
cancel.  It was also possible to start planting multiple explosives.
made a small change to make QGVAR(PlantingExplosive) always reset
 2015-04-09 14:48:27 -05: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
Glowbal
d94943a9ff getting hitpoint damage on non existing hitpoint returns type instead of bool 2015-04-09 21:38:35 +02:00
Glowbal
093d340ee7 Changed: Dragging/carrying now works for units with broken legs 
Added unload and load of unconscious units
 2015-04-09 21:23:10 +02:00
ulteq
ab238cf404 Removed isDedicated checks 2015-04-09 20:39:38 +02:00
ulteq
5ff54f7d1c Implemented a new logic that decides when to use AB. 
*Added a new global variable ace_advanced_ballistics_enabled
*Added an updateTrajectoryPFH to the winddeflection (WD) module
*WD is now automatically disabled when AB is enabled
*The new updateTrajectoryPFH is called whenever AB aborts

-> Wind deflection is now always present (either through AB or WD)
-> AB no longer runs for non local units (unless they use high power optics)
 2015-04-09 20:27:10 +02:00
Glowbal
0926397ab4 Removed deadcode and obvious comments 2015-04-09 20:13:46 +02:00
Glowbal
39cbf21278 Removed deprecated carry functions 2015-04-09 20:12:30 +02:00
commy2
a6a19e956b flashsupressors for new weapons, #264 2015-04-09 19:59:08 +02:00
ulteq
5fe483cf33 Fixed incorrect function call 2015-04-09 19:12:39 +02:00
ulteq
377390d282 Added missing braces 2015-04-09 19:12:10 +02:00
jaynus
fe147c4986 Config expansion. 2015-04-09 09:39:23 -07:00
commy2
2d265ec6c2 prevent ai fro being stuck, #290 2015-04-09 16:54:50 +02:00
commy2
b41c6280ba prvent falling ai from being stcuk, fix #290 2015-04-09 16:52:59 +02:00
commy2
147fcdfa0c Merge pull request #392 from KoffeinFlummi/requiredaddons 
sorting out required addons for modularity
 2015-04-09 16:37:47 +02:00
esteldunedain
f0cc0941e5 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-09 10:05:38 -03:00
esteldunedain
8519bb04b7 Merge remote-tracking branch 'origin/removeRecoil' 
Conflicts:
	addons/recoil/config.cpp
 2015-04-09 10:05:14 -03:00
Nicolás Badano
c57044fd4a Merge pull request #390 from KoffeinFlummi/betterMapColors 
Improve map colors by taking them from A2
 2015-04-09 09:52:06 -03:00
esteldunedain
6447b39d1a Merge branch 'master' of github.com:KoffeinFlummi/ACE3 
Conflicts:
	addons/scopes/XEH_postInit.sqf
 2015-04-09 09:32:58 -03:00
esteldunedain
34639c153c Allow holding scope adjustment keys 2015-04-09 09:31:18 -03:00
KoffeinFlummi
3a871eed58 Merge branch 'master' into tools-cleanup 2015-04-09 13:37:19 +02:00
commy2
5ea35a01bb sorting out required addons for modularity 2015-04-09 13:23:29 +02:00
esteldunedain
99aa439561 Improve map colors taking them from A2 2015-04-09 01:28:36 -03: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
PabstMirror
2033676e81 another undef to Make PBO-Project Happy 2015-04-08 18:20:00 -05: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
jaynus
97febd6207 Disable debug, wtf math 2015-04-08 14:31:44 -07:00
ulteq
6626379a25 Added new 1.42 config data 2015-04-08 23:07:26 +02:00
jaynus
04b0efb22b Safer calling, build out attack profiles. 2015-04-08 13:57:08 -07:00
jaynus
cf876116a9 Working configuration based guidance framework. 2015-04-08 13:45:43 -07:00
commy2
3e3390750d manual merge 2015-04-08 22:01:41 +02:00
commy2
c5b38c8942 manual merge 2015-04-08 21:51:42 +02:00
commy2
1ae69d56ff Merge pull request #377 from KoffeinFlummi/142light 
142 directional light for map effects
 2015-04-08 21:46:48 +02:00
commy2
7346c194f4 Merge pull request #306 from KoffeinFlummi/optics 
Taosenai's Animated Optics req 1.42
 2015-04-08 21:41:12 +02:00
PabstMirror
c3564ee883 undef to Make PBO-Project Happy 2015-04-08 14:38:29 -05:00
jaynus
6f9203262a tweak default deflection values for testing 2015-04-08 12:32:33 -07:00
Glowbal
3702679ee4 fixed wrong value for radio disabled on waking up 2015-04-08 21:31:59 +02:00
ulteq
b5b15ba591 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-08 21:29:17 +02:00
ulteq
09cfddc338 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-08 21:28:50 +02:00
ulteq
a6e3d1917d Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 2015-04-08 21:28:17 +02:00
jaynus
d2e3ea347a Merge remote-tracking branch 'origin/master' into allTheMissiles 2015-04-08 12:17:46 -07:00
PabstMirror
a4af1fcb30 Fix Marker Placement on UAV Map 2015-04-08 13:55:29 -05:00
jaynus
3946ee32d2 Fixes left/right issue. 2015-04-08 11:27:30 -07:00
commy2
3de3432664 Merge pull request #271 from KoffeinFlummi/142resting 
1.42 - Remove scripted weapon resting
 2015-04-08 20:26:13 +02:00
PabstMirror
2bc0976979 Merge pull request #277 from KoffeinFlummi/revert-276-revert-272-142menudeploy 
Revert "Revert "1.42 - cursor mode when bipod deployed""
 2015-04-08 13:26:05 -05:00
PabstMirror
023a2d2202 Merge pull request #267 from KoffeinFlummi/142Markers 
1.42 Marker Placement
 2015-04-08 13:24:55 -05:00
PabstMirror
176a39e86c Merge pull request #265 from KoffeinFlummi/142InventoryConfig 
1.42 Inventory Config
 2015-04-08 13:22:12 -05:00
PabstMirror
007e4fc234 Merge pull request #274 from KoffeinFlummi/142requiredaddons 
1.42 ensure ace is loaded after marksmen configs
 2015-04-08 13:21:33 -05:00
jaynus
bc7943d729 added todo 2015-04-08 09:18:11 -07:00
jaynus
87dac2c2ad Merge remote-tracking branch 'origin/master' into allTheMissiles 2015-04-08 08:55:14 -07:00
jaynus
177be598d7 Fixes: Laser designator now uses strongest ray result. 2015-04-08 08:48:08 -07:00
jaynus
64724737cd Code passing cleanup. 2015-04-08 08:35:24 -07:00
PabstMirror
af3d6a5113 #386 - Ace Options Menu on main menu 
Same limitations as CBA controls, needs a intro or mission loaded
Doesn't work with -skipintro command line.
 2015-04-08 10:33:12 -05:00
jaynus
61f5324d29 ACE_Settings entry for guidance. 2015-04-08 08:19:19 -07:00
jaynus
104dd2258e Guidance framework working. 2015-04-08 08:01:39 -07:00
ulteq
c1c5711e8d Fixed a typo 2015-04-08 13:58:22 +02:00
ulteq
823d834457 Replaced EGVAR(advanced_ballistics,Altitude) with EGVAR(weather,Altitude) 2015-04-08 12:56:34 +02:00
ulteq
e3626eca00 The winddeflection firedEH will now exit automatically, when the advanced_ballistics module is present. 2015-04-08 12:42:56 +02:00
ulteq
6d46567696 Overworked ATragMX canShow function 2015-04-08 11:44:09 +02:00
ulteq
f107b700a7 Fixed Kestrel4500 self interaction menu conditions 2015-04-08 11:26:12 +02:00
ulteq
f974e7a9a1 Removed duplicate Kestrel4500_ prefix 2015-04-08 11:25:15 +02:00
ulteq
9f2a862489 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 2015-04-08 11:10:02 +02:00
ulteq
16ac43f733 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-08 11:08:53 +02:00
ulteq
78bb9193be Merge branch 'ATragMX' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 
Conflicts:
	addons/atragmx/RscTitles.hpp
	addons/atragmx/functions/fnc_calculate_solution.sqf
	addons/atragmx/functions/fnc_calculate_target_range_assist.sqf
	addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
 2015-04-08 11:08:28 +02:00
ulteq
15a594ccbc Removed duplicate ATragMX_ prefix 2015-04-08 11:05:28 +02:00
ulteq
4a469de0f8 Deleted an unused function 2015-04-08 11:01:53 +02:00
commy2
01a9374a26 Merge pull request #382 from KoffeinFlummi/disablebs 
disable cursor showing map position
 2015-04-08 10:48:31 +02:00
commy2
deece11689 remove debug 2015-04-08 10:47:56 +02:00
commy2
a47cdb9738 disable map cursor coordinates in mp 2015-04-08 10:45:57 +02:00
KoffeinFlummi
a209e49f1c Remove partname from patientInfoDisplay for basic. 2015-04-08 07:39:16 +02:00
KoffeinFlummi
1dcff94ec7 Remove hitpart from bandage action name 
Since the context of the interaction menu makes it clear what body part
you mean anyways, this is unnecessary.
 2015-04-08 07:35:31 +02:00
KoffeinFlummi
5bd1ee7ecd Do not use a treshold for unassigned damage. 2015-04-08 07:21:34 +02:00
esteldunedain
b18bcf8835 Add option to turn on/off cursor coordinates 2015-04-08 01:49:56 -03:00
commy2
691ab012b4 fix map loaded on preInit 2015-04-08 00:44:14 +02:00
commy2
4834facccf moving it to map 2015-04-08 00:30:36 +02:00
KoffeinFlummi
ce45237989 Report full version number in RPT for debugging 2015-04-08 00:27:00 +02:00
commy2
50dbbda8eb disable cursor showing map position 2015-04-08 00:20:43 +02:00
esteldunedain
ed3ac637d2 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-07 19:19:46 -03:00
PabstMirror
2f4335d3c2 #344 - Ignore missing ace_serverconfig on client 2015-04-07 17:14:27 -05:00
commy2
949c5d4333 manual merge 2015-04-07 23:26:16 +02:00
commy2
518c704db6 manual merge 2015-04-07 23:18:31 +02:00
esteldunedain
2d211e839f Further remove standalone { on code 2015-04-07 18:09:32 -03:00
commy2
2e66e57535 manual merge 2015-04-07 23:08:17 +02:00
esteldunedain
24750781aa Remove { on newlines 2015-04-07 18:03:30 -03:00
commy2
d1b8595c0e light intensity from object: handle campfires 2015-04-07 23:02:54 +02:00
ulteq
5dba9f7b3f Fixed inconsistent tabulation 2015-04-07 22:53:20 +02:00
PabstMirror
d060b13bbe #86 - Stretch gps info box to support 8 digits 2015-04-07 15:47:12 -05:00
ulteq
31b19a4ef3 Replaced tabs with spaces 2015-04-07 22:44:26 +02:00
ulteq
45e7194117 Fixed Readme 2015-04-07 22:40:27 +02:00
ulteq
4ea91d832e Fixed incorrect canShow function 2015-04-07 22:37:47 +02:00
commy2
b6c278e7d3 fix using efunc vs func 2015-04-07 22:33:35 +02:00
ulteq
07e6c89267 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-07 22:27:13 +02:00
ulteq
c3fbd8a195 Removed the old Kestrel module 2015-04-07 22:22:41 +02:00
commy2
96268b6407 directional light for map effects 2015-04-07 22:19:03 +02:00
ulteq
b60a8f2547 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-07 22:13:20 +02:00
ulteq
183034183e Resolved a minor issue between protractor and wind info 2015-04-07 22:02:38 +02:00
PabstMirror
6b0fb84f65 Cleanup / Headers 2015-04-07 15:01:44 -05:00
jaynus
bf70a9ba77 Tracers and colors 2015-04-07 12:59:35 -07:00
ulteq
ef3205e078 Replaced all <floats> with <NUMBER> 2015-04-07 21:54:29 +02:00
ulteq
c9ad2b279d Commented all advanced ballistics functions 2015-04-07 21:46:43 +02:00
jaynus
fa9cf0280c script error 2015-04-07 12:44:15 -07:00
commy2
88a5519465 cache the frames 2015-04-07 21:42:08 +02:00
PabstMirror
2ad9193475 Use DrawIcon for map tools 2015-04-07 14:38:35 -05:00
jaynus
d3d5554c49 Laser designation information localized to vehicle. 2015-04-07 12:35:34 -07:00
ulteq
a8cbcb14d3 Replaced tabs with spaces 2015-04-07 21:27:04 +02:00
ulteq
650c9592c8 Updated the readme 2015-04-07 21:24:09 +02:00
ulteq
26c8f9588a AdvancedBallistics is now always using the dll extension 2015-04-07 21:22:58 +02:00
commy2
14718eb5b4 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 21:22:21 +02:00
commy2
d825505aa0 cache light config properties 2015-04-07 21:22:00 +02:00
jaynus
0c3b51c28b Merge remote-tracking branch 'origin/master' into allTheMissiles 2015-04-07 12:12:05 -07:00
jaynus
2ea7ecdbf7 Working save. 2015-04-07 12:11:28 -07:00
Glowbal
14906c68c0 Merge pull request #374 from KoffeinFlummi/medicalImprovements 
Medical improvements
 2015-04-07 21:07:28 +02:00
Glowbal
ffbe9f0c71 Setting for getting rid of hitpoint damage after adv medical damage 2015-04-07 21:06:48 +02:00
ulteq
2a458f2e3d Removed Altitude and Latitude negation 2015-04-07 21:03:17 +02:00
ulteq
9fb640195a Removed weather hack 2015-04-07 21:02:57 +02:00
ulteq
b5b962bd4a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into abIntegration 2015-04-07 20:59:37 +02:00
ulteq
5443d46f7b Default Altitude and Latitude are now read from the config 2015-04-07 20:59:05 +02:00
commy2
ba618a69ec Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 20:54:45 +02:00