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
2,373 Commits 73 Branches 88 Tags 752 MiB
35044fa16b
Commit Graph

2145 Commits

Author SHA1 Message Date
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
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
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
commy2
2e66e57535 manual merge 2015-04-07 23:08:17 +02:00
commy2
d1b8595c0e light intensity from object: handle campfires 2015-04-07 23:02:54 +02:00
PabstMirror
d060b13bbe #86 - Stretch gps info box to support 8 digits 2015-04-07 15:47:12 -05:00
commy2
b6c278e7d3 fix using efunc vs func 2015-04-07 22:33:35 +02:00
commy2
96268b6407 directional light for map effects 2015-04-07 22:19:03 +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
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
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
commy2
ba618a69ec Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 20:54:45 +02:00
commy2
722c2af4dc lightIntensity, handle soldier flashlights 2015-04-07 20:54:25 +02:00
Glowbal
c823826f17 Merge branch 'master' into medicalImprovements 2015-04-07 20:53:24 +02:00
Glowbal
2b341c2a8b left over CSE function calls removed 2015-04-07 20:50:44 +02:00
Glowbal
545014b073 missing return value 2015-04-07 20:47:36 +02:00
Glowbal
ac3bda3135 improvements to displayPatientInformation. Bandaged wounds should be more clear now 2015-04-07 20:19:32 +02:00
esteldunedain
04d94bb7be Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-07 15:01:53 -03:00
esteldunedain
765ae4ee64 Merge branch 'master' into tabCleanup 
Conflicts:
	addons/explosives/functions/fnc_addClacker.sqf
	addons/explosives/functions/fnc_detonateExplosive.sqf
	addons/explosives/functions/fnc_getPlacedExplosives.sqf
	addons/explosives/functions/fnc_openDetonateUI.sqf
	addons/explosives/functions/fnc_openPlaceUI.sqf
	addons/explosives/functions/fnc_openTransmitterUI.sqf
	addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
	addons/explosives/functions/fnc_placeExplosive.sqf
	addons/explosives/functions/fnc_place_Approve.sqf
	addons/explosives/functions/fnc_setPosition.sqf
 2015-04-07 15:00:56 -03:00
Glowbal
526e24f133 formatting 2015-04-07 19:56:54 +02:00
Glowbal
3d82cb8eac Removed deprecated onTreatmentCompleted event 2015-04-07 19:54:24 +02:00
commy2
d34cfdb003 fix: day laser when being captured 2015-04-07 19:38:19 +02:00
Glowbal
7fb3ac6740 Added _x_ca suffixes to all item pictures 2015-04-07 19:16:56 +02:00
commy2
98f7125171 function to return light intensity recieved from another object 2015-04-07 18:54:53 +02:00
jaynus
6deff125ce Self designation lockdown and cleanup 2015-04-07 09:05:19 -07:00
jaynus
f973505746 DAGR and Hellfire modified config values. 2015-04-07 08:53:47 -07:00
commy2
deabbcd840 add function that returns config properties of a vehicles light 2015-04-07 15:43:23 +02:00
commy2
5df25cf44d function to return all turned on lights of any objects 2015-04-07 15:06:27 +02:00
commy2
0d126dc562 function to return object's lights 2015-04-07 14:44:34 +02:00
commy2
bb8762f4b9 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 13:55:09 +02:00
commy2
ad5aad60c7 fix: ambient brightness can return values greater 1 2015-04-07 13:54:33 +02:00
Pierre Humberdroz (meat)
4c49765c8f translation changes 
#370
 2015-04-07 10:39:41 +02:00
bux578
92da20ce62 translations 
#367
 2015-04-07 10:02:33 +02:00
bux578
9ce2e38814 removed <orignal> language entry 2015-04-07 09:27:26 +02:00
KoffeinFlummi
8d5bdd2c01 Revert "fix shitty initSpeed definitions breaking SD mags, fix #182" 
This reverts commit 55f49eaa1c.
 2015-04-07 09:04:17 +02:00
jaynus
9aa84322c7 Magazine, Ammo and Missile breakout. 2015-04-06 23:15:26 -07:00
jaynus
2d019abede WIP Guidance rewrites. 2015-04-06 22:38:34 -07:00
jaynus
99008ac729 Merge pull request #332 from KoffeinFlummi/medicalBox 
Added: Generic placeholder medical box.
 2015-04-06 19:09:16 -07:00
jaynus
eb6fdc2e34 cleaner LOAL DAGR 2015-04-06 19:03:11 -07:00
jaynus
a744896b20 Fixed: jaynus fucked up. 2015-04-06 18:51:08 -07:00
jaynus
34444ebb32 Fixed: github merge error fixed. 2015-04-06 18:37:05 -07:00
jaynus
27caff5564 Fixed: Add platform velocity to FCS calculations; resolves #361 2015-04-06 18:36:39 -07:00
Glowbal
12493f8595 Improved wounds configuration (missing maxDamage values added) 2015-04-07 00:57:05 +02:00
Glowbal
c7549a13a4 Improved pain reduction 2015-04-07 00:41:53 +02:00
jaynus
446a30e4fc Merge pull request #352 from KoffeinFlummi/comancheFixes 
Goes along with FCS fixes, merging quickly due to overall fixes.
 2015-04-06 15:07:09 -07:00
jaynus
4a8f24b59c Merge pull request #356 from KoffeinFlummi/fcsMadness 
Fcs madness
 2015-04-06 15:00:24 -07:00
jaynus
e0605f9e81 Remove default hint for FCS but play sound, Resolves #317 2015-04-06 14:57:07 -07:00
jaynus
7fa8365d51 Remove debug, new Release build of extension. 2015-04-06 14:50:22 -07:00
esteldunedain
09461d94ef Rewritten changeProjectileDirection 2015-04-06 18:10:17 -03:00
esteldunedain
aec9962121 Fix changeProjectileDirection 2015-04-06 18:02:08 -03:00
esteldunedain
35129a7a41 Debug stuff for the velocity correction 2015-04-06 17:37:18 -03:00
Garth L-H de Wet
513ab25f54 Merge branch 'master' into explosiveInteraction 
Conflicts:
	addons/explosives/functions/fnc_placeExplosive.sqf
 2015-04-06 22:30:27 +02:00
Garth L-H de Wet
9d7d71b1b1 Changed the tabs to 4 spaces. Hopefully. 2015-04-06 22:20:11 +02:00
Garth "L-H" de Wet
e0b4efd9f1 Merge pull request #280 from KoffeinFlummi/explosiveInteraction 
Explosive interaction
 2015-04-06 22:12:04 +02:00
Garth L-H de Wet
44c597f7c5 Explosives, 2 spaces to 4 space tab. 2015-04-06 22:10:00 +02:00
jaynus
acf683e621 Call every 10th of a second. 2015-04-06 12:58:53 -07:00
jaynus
906612f954 Fixed: Gunner FOV, explosive rounds and FPS drop. 2015-04-06 12:54:06 -07:00
esteldunedain
04e9f28734 Make function handle negative numbers 2015-04-06 16:12:38 -03:00
commy2
c1799616c7 add function to convert numbers to string 2015-04-06 20:47:11 +02:00
jaynus
d6cf07a3b6 Changed: FCS update was not being delayed for laser. Delay of 0.5s added. 2015-04-06 11:44:17 -07:00
Glowbal
bdb5c8e728 Merge pull request #349 from KoffeinFlummi/medicalBugFixes 
Exit displayPatientInformation PFH when a different selection is selected.
 2015-04-06 19:49:12 +02:00
Glowbal
4c6dad69f9 Should fix #347. Could not reproduce but this at least fixes some issues (which most likely caused the error) 2015-04-06 19:43:27 +02:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
jaynus
bdcec243a8 Changed: Comanche Gatling HEDP effects and dispersion. 2015-04-06 09:14:56 -07:00
PabstMirror
c1abb2669d #340 - Fix stringtables 2015-04-06 11:03:04 -05:00
jaynus
c3dbcf1351 increase frequency of laser update. 2015-04-06 07:40:20 -07:00
commy2
796a430292 Merge pull request #326 from KoffeinFlummi/VectorFOSfix 
Fix for Vector Fall-of-Shot display
 2015-04-06 16:20:13 +02:00
commy2
1e497c228c switch sides of add/drop left/right 2015-04-06 16:18:59 +02:00
Glowbal
1c28e82725 Merge pull request #341 from KoffeinFlummi/medicalFixes 
Fixes for bodybag and support for radio mods in medical
 2015-04-06 16:17:08 +02:00
commy2
ebd1e555a3 fix: derp when switching control numbers 2015-04-06 16:07:52 +02:00
Glowbal
76ad6b8294 Added missing main actions 2015-04-06 15:46:50 +02:00
Glowbal
ce4cdd3722 staged bodybag fixes 2015-04-06 15:11:54 +02:00
Glowbal
661d93e82c Working commit 2015-04-06 14:51:17 +02:00
Glowbal
8e176eff55 Fixed treatment locations 2015-04-06 14:32:37 +02:00
Glowbal
43b3190202 config fix 2015-04-06 14:14:00 +02:00
Glowbal
10a1108aae Added support for customizable treatment location limitation 2015-04-06 14:11:10 +02:00
Glowbal
2657677bd8 Added support for TFR/ACRE on unconscious 2015-04-06 14:09:59 +02:00
esteldunedain
be81e16c71 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-06 09:07:20 -03:00
esteldunedain
4cf2410622 Fix duplicated laser designator actions 2015-04-06 09:06:56 -03:00
Glowbal
0bcb7f76dc This should not be here 2015-04-06 13:12:40 +02:00
Glowbal
83c670576b fixed typeOf instead of typeName 2015-04-06 11:58:52 +02:00
Glowbal
befb52e855 Merge pull request #260 from KoffeinFlummi/serverConfig 
Server Config support
 2015-04-06 01:42:33 +02:00
jaynus
c87f2f8bcc Added: Generic placeholder medical box. 2015-04-05 15:16:32 -07:00
jaynus
8fa6ab38fd Merge branch 'serverConfig' of github.com:KoffeinFlummi/ACE3 into serverConfig 2015-04-05 14:08:54 -07:00
jaynus
d6632a0e45 Module should default to true. 2015-04-05 14:08:42 -07:00
jaynus
e3ad83e109 Merge pull request #286 from KoffeinFlummi/lasers 
Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS
 2015-04-05 13:26:54 -07:00
VKing
8255ff666d Fix long-standing typo (get it?) 2015-04-05 22:18:28 +02:00
VKing
8ad202b039 Fix Fall-of-Shot units being inverted 2015-04-05 22:16:47 +02:00
Glowbal
9e3bb8ac95 fixed triage card 2015-04-05 22:07:38 +02:00
jaynus
7d5fca3c5a DIR guidance on Javelin missiles/Titan. TODO: The guidance codes need re-works. 2015-04-05 12:55:17 -07:00
Glowbal
12d10b8bf7 Blood loss for basic (from AGM medical) 2015-04-05 21:38:15 +02:00
jaynus
788487baa5 Debug disable 2015-04-05 11:54:00 -07:00
jaynus
34b834e700 Rudimentary hold-tab lock on titan, sounds added, jink removed, state tracking. 2015-04-05 11:51:39 -07:00
Glowbal
147bb92541 Added setting to disable variable sync (recommended on) 2015-04-05 20:23:07 +02:00
Glowbal
7ffd690a71 Changed: IVs are now synced and medics can see a unit is receiving an IV 2015-04-05 20:11:54 +02:00
jaynus
278ffe7d65 save 2015-04-05 10:45:09 -07:00
Glowbal
89015c94d4 Removed rouge system chat and diag_log messages 2015-04-05 19:42:55 +02:00
Glowbal
ae2adc17b9 changed all medical items to inherit from ACE_ItemCore 2015-04-05 19:37:07 +02:00
Glowbal
2c0bec2b07 disabled injury visualization for bandaged wounds 2015-04-05 19:36:40 +02:00
Glowbal
171ebf827a No litter created when in vehicle 2015-04-05 19:28:57 +02:00
Glowbal
a0bbbdb0b7 fixed place in bodybag 2015-04-05 19:27:53 +02:00
Glowbal
f52891436a oops 2015-04-05 19:27:40 +02:00
Glowbal
ecf84ae039 Updated module classname to be inline with others 2015-04-05 19:27:28 +02:00
Glowbal
0f52059249 Fixed CPR script error 2015-04-05 19:27:09 +02:00
Glowbal
dca75c5557 Implemented bandaged wounds setting (adv) 2015-04-05 19:26:33 +02:00
Glowbal
e3e17d8fcb Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-05 15:51:42 +02:00
Glowbal
c210efcef0 fixed #312 Error occurred with undefined damageTypes. In this case; getting run over by a vehicle. 2015-04-05 15:51:28 +02:00
Glowbal
c514fde5d3 Not necessary here. Makes it only work once. 2015-04-05 15:13:34 +02:00
Glowbal
bae3826bdf Polished server config export 2015-04-05 14:48:23 +02:00
Glowbal
b6b880fba0 Merge pull request #310 from KoffeinFlummi/medicalActionsWhileBoarded 
Add medical actions while boarded.
 2015-04-05 14:36:17 +02:00
Glowbal
92bdae9321 Removed diag_log spam 2015-04-05 13:25:53 +02:00
Glowbal
32625b446b fixed animation being reset even when inside a vehicle 2015-04-05 13:03:09 +02:00
Glowbal
cf1f641424 Moved selfActions to a separate hpp file 2015-04-05 13:02:55 +02:00
Glowbal
f1a3d588ba Changed initialization order of config settings. 
ACE_Settings should never force any setting by default. Loading it first ensures that all settings from ACE_Settings exist. This way, ACE_ServerSettings will override ACE_Settings, even if no force is used. Mission settings will override the server config settings, if no force is used.

This ensures that all settings are of their correct type, in case an outdated or corrupt server config is used, as well as have their correct localized display name and description
 2015-04-05 12:38:10 +02:00
Glowbal
279641787d Added checks for enforce usage only in SP with settings enabled 2015-04-05 11:11:54 +02:00
Glowbal
202904f1f9 Using 1 and 0 instead of true and false for config export 2015-04-05 10:32:40 +02:00
jaynus
6288a809f7 actually final terminal decent. woops. 2015-04-04 22:36:09 -07:00
Glowbal
d487092d84 formatting 2015-04-05 02:33:45 +02:00
Glowbal
110635df7b improved formatting 2015-04-05 02:33:11 +02:00
Glowbal
a0af055917 export config should force the settings 2015-04-05 02:22:24 +02:00
Glowbal
7928ca71a5 Server side config export 2015-04-05 02:17:43 +02:00
jaynus
583acf6558 ctrlShow is not operational on ControlGroups in RscOptics. 2015-04-04 17:15:59 -07:00
jaynus
ab0d289762 Merge remote-tracking branch 'origin/master' into lasers 2015-04-04 16:56:03 -07:00
jaynus
aee7eb9406 Working save. 2015-04-04 16:55:53 -07:00
PabstMirror
75351f2a5b TapShoulder - fix hint message 2015-04-04 17:54:15 -05:00
esteldunedain
f417fa2285 Add medical actions while boarded. 2015-04-04 19:41:12 -03:00
PabstMirror
e03d3ed619 Merge pull request #284 from KoffeinFlummi/beltRepacking 
MagRepack - Belt Repacking / Child Actions
 2015-04-04 17:18:53 -05:00
esteldunedain
848b5133ef Remove debug chats for interact_menu 2015-04-04 19:15:29 -03:00
Glowbal
044d2551ce Merge branch 'master' into serverConfig 2015-04-04 23:00:47 +02:00
Glowbal
b18d704686 Merge pull request #300 from KoffeinFlummi/medicalImprovements 
Medical Litter & other additions
 2015-04-04 22:52:05 +02:00
Glowbal
7f9043897c wake up by epinephrine in revive state 2015-04-04 22:50:38 +02:00
Glowbal
551c36d690 fixed treatment didnt work inside vehicles 2015-04-04 22:48:52 +02:00
Glowbal
77d39877d2 Merge branch 'master' into medicalImprovements 2015-04-04 22:01:15 +02:00
Glowbal
a56e8745c3 fixed module settings 2015-04-04 21:59:18 +02:00
Glowbal
d37094dc7a Work around for self treatment when cursorMenu from interact is used. 
Executing it one frame later works fine, but otherwise the loading bar will fail.
 2015-04-04 21:52:00 +02:00
Glowbal
5c3ee0dd1a Added settings to modules & fixed medicalVehicle module 2015-04-04 21:51:18 +02:00
PabstMirror
6ec0859f85 MicroDAGR - Allow use in vehicles 
Can't show minimap display in turret view (cameraView = "gunner"), but
can bring up the interactive dialog
 2015-04-04 14:35:24 -05:00
Glowbal
89ec817ce3 Added setting for litter cleanup delay 2015-04-04 21:26:41 +02:00
Glowbal
1d33ce52b3 added support for adjustable settings for consumeItem and medicalLevel 2015-04-04 21:20:24 +02:00
Glowbal
93d9088410 fixed cardiac arrest 2015-04-04 21:20:03 +02:00
Glowbal
e3aaac7005 Only select primary weapon if no current weapon is selected 2015-04-04 20:49:30 +02:00
Glowbal
a7edd00420 removed useless doAnimation call when animation is not "unconscious" in unconscious state 2015-04-04 20:41:49 +02:00
Glowbal
2b9afcbb6c Now supports unconscious state fully 2015-04-04 20:37:25 +02:00
Nicolás Badano
5f4030469f Merge pull request #309 from KoffeinFlummi/closeInteractMenu 
Close interact menu when knocked out
 2015-04-04 15:35:00 -03:00
Glowbal
e78fc55b45 changed; When standing before treatment, the caller will now move into crouch instead of standing up again. 2015-04-04 20:21:52 +02:00
Glowbal
ddb01e7865 Improved unconscious wakeup animations 2015-04-04 20:21:06 +02:00
Glowbal
2420db78a1 CreateLitter now supports conditions and is selection specific. 
Format:
litter[] = {
   {"SelectionName", "Condition", {"litterClassname"} },
   ...
};

The array with litter classnames also support 2d arrays. ie:
{"SelectionName", "Condition", {{"litterClassname"}} }
Of array entries it will select a random classname.
 2015-04-04 20:20:29 +02:00
commy2
55d7c0f0e6 remove scripted recoil 2015-04-04 20:02:02 +02:00
commy2
8d0ee2d578 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into 142resting 2015-04-04 19:56:43 +02:00
PabstMirror
efe810ae4e Private Variables for localEvent 2015-04-04 12:08:59 -05:00
jaynus
9d06d7c7ca readme/author updates. 2015-04-04 09:09:42 -07:00
Glowbal
08e1949078 Improved patient unconscious animation 2015-04-04 18:08:41 +02:00
Glowbal
31b7ade057 Support unconscious animation for patient upon treatment 2015-04-04 17:33:20 +02:00
esteldunedain
d090b3328c - Close interact_menu when the player falls unconscious 
- Prevent all types of interactions while unconscious
 2015-04-04 12:25:49 -03:00
Glowbal
48758ff0e3 fixed incorrect typeNames 2015-04-04 16:59:52 +02:00
Glowbal
b54179696a fixed basic revive 2 2015-04-04 16:28:09 +02:00
Glowbal
18900cb82c fixed revive for basic 2015-04-04 16:27:44 +02:00
Glowbal
3a117e9b4d fixed incorrect unit used for fullheal (was healing caller) 2015-04-04 16:26:49 +02:00
commy2
e27c91710c Revert "Fixed: numerous player-based events were repeat invalid firing for null player object. This is now limited to only appropriate null-friendly events." 
This reverts commit 6864529d9c.
 2015-04-04 16:26:32 +02:00
commy2
1dea63067a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into optics 2015-04-04 16:14:19 +02:00
Nicolás Badano
b78b93f2cd Merge pull request #303 from KoffeinFlummi/strongerTextShadow 
Stronger shadow for the interact_menu text
 2015-04-04 10:25:27 -03:00
commy2
d496cabbbb remove obsolete folder from TO_MERGE folder 2015-04-04 14:38:49 +02:00
commy2
a5b071912f CfgPreloadtextures for optics 2015-04-04 13:15:27 +02:00
Glowbal
914c5ffd0f fixed bandage optional parameter 2015-04-04 12:14:21 +02:00
Glowbal
7c296c413d Litter has a more random spread 2015-04-04 12:13:55 +02:00
Glowbal
d81dcba543 Added more litter variants 2015-04-04 12:13:42 +02:00
commy2
b7fa2bd8b3 disable pip scopes in arsenal 2015-04-04 12:06:20 +02:00
commy2
5fdd93587c localization 2015-04-04 09:16:41 +02:00
commy2
ea275b1e52 2d with and without PIP 2015-04-04 08:51:22 +02:00
PabstMirror
c055911231 Cleanup, remove debug spam 2015-04-04 00:52:21 -05:00
PabstMirror
9f60bf9906 Merge branch 'master' into disarmingTest 2015-04-04 00:09:36 -05:00
commy2
98d217d97e handle 2d optics recoil 2015-04-04 06:19:19 +02:00
jaynus
2e6a9c4967 Placeholder sounds for jav/titan locking. accurate fire tweaks 2015-04-03 21:07:04 -07:00
esteldunedain
06f6039dca Stronger shadow for the interact_menu text 2015-04-04 01:04:32 -03:00
PabstMirror
6cd7ab2f7d Fix getChildren - condition/only show inv mags 2015-04-03 22:37:48 -05:00
jaynus
8710bee3b8 Titan Work. 2015-04-03 20:27:52 -07:00
esteldunedain
99a90bf539 Remove ace_recoil (#271) 2015-04-04 00:25:44 -03:00
jaynus
583347aaab tab cleanup, javelin work. 2015-04-03 17:28:33 -07:00
Glowbal
2645b102f0 Replaced waitAndExec for single PFH with 30s delay 2015-04-04 02:28:14 +02:00
PabstMirror
07dfe52133 Remove Duplicate Mortar Code (inherit from statics) 
Before an action added to staticWeapon wouldn't be applied to mk6 mortar
 2015-04-03 19:07:13 -05:00
esteldunedain
a5ff34e1d8 Keep cursored menus always centered. Fix #299. 2015-04-03 20:49:40 -03:00
Glowbal
83fbc1ff10 Added setting to toggle litter creation on/off 2015-04-04 01:47:56 +02:00
jaynus
65388e1146 Added: Image Assets 
Added: ACE_AIR_SAFETY weapon for all aircraft
Changed: ACE'ified Kimi code
 2015-04-03 16:46:37 -07:00
Glowbal
7f45d25ee5 Added litter for medical treatment 2015-04-04 01:42:13 +02:00
jaynus
1672a5f2f9 Added: Comanche HUD revamped+stabalized, awesomeness activated. 2015-04-03 16:17:26 -07:00
PabstMirror
824448833f Basic Test Mission 
Very simple test mission with creates, debug console enabled for all.
 2015-04-03 18:14:45 -05:00
Glowbal
4ac77bceab Model fixes and imports 2015-04-04 01:09:44 +02:00
Nou
fff8a240e3 Remove compensation for movement, instead use modelToWorldVisual 2015-04-03 15:31:44 -07:00
Glowbal
5e0f5b8b94 Added full heal/PAK for basic 2015-04-04 00:31:12 +02:00
Glowbal
7230687ea2 corrected revive setting classes 2015-04-04 00:30:59 +02:00
Nou
6541600d44 Switch everything to use modelToWorldVisual instead of modelToWorld. 2015-04-03 15:26:27 -07:00
Glowbal
d3c9d111e1 fullHeal now resets reviveState 2015-04-03 23:58:46 +02:00
Glowbal
4ddb496d8b Added max Revive lives 2015-04-03 23:56:32 +02:00
Nou
6c4dda2dc8 Use visual versions. 2015-04-03 14:40:01 -07:00
jaynus
735384cdb4 stabalize a little more and do some debug drawing. 2015-04-03 14:28:12 -07:00
esteldunedain
bd813d0d7a Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-03 18:22:47 -03:00
esteldunedain
2b4d806925 Reduce or eliminate backblast cause by terrain depending on relative slope. Fix #294 2015-04-03 18:22:04 -03:00
Glowbal
36288fce43 Updated medical action config. 
Added bodybag action
Added Tourniquet action to basic.
Added more displayNameProgress entries.
Removed deadcode
 2015-04-03 22:59:28 +02:00
Glowbal
a6ce961ca1 Usage of isBeingCarried and isBeingDragged 2015-04-03 22:45:16 +02:00
Glowbal
244bac8562 Merge branch 'master' into medicalAdvanced 2015-04-03 22:42:09 +02:00
Glowbal
05389e7e25 Implemented useItems for treatment (basic and adv) 
Will remove items on treatment start. Add again on treatmentFailure.
Based upon consumeItem config setting.
 2015-04-03 22:40:36 +02:00
commy2
9968bc132c get a pip scope to work 2015-04-03 22:30:29 +02:00
Glowbal
038ed5f23e Removed deprecated returnDamage parameters 2015-04-03 21:59:47 +02:00
Glowbal
1ef262c119 Support for enableOverdosing setting in advanced 2015-04-03 21:53:58 +02:00
Glowbal
c3ddbb4be7 Prevent the usage of the blood loss coefficient to increase blood volume on bleeding 2015-04-03 21:51:44 +02:00
Glowbal
ecf16ad9f1 fixed prevent instant death setting 2015-04-03 21:49:46 +02:00
PabstMirror
604e851423 Medical - isBeingCarried 2015-04-03 14:37:04 -05:00
Glowbal
d4a6dd1038 Removed the options to enable fractures and airway through mission module 2015-04-03 21:32:49 +02:00
Glowbal
1b02cb2e82 examine actions now use activity log 2015-04-03 21:03:39 +02:00
Glowbal
43efc21f27 Only display the activity log in the activity list. 2015-04-03 21:03:22 +02:00
Glowbal
8881de4a07 Removed activity log background, made wider. Added shadow to text. 2015-04-03 21:02:56 +02:00
Glowbal
8d7ac1f930 Added selected bodypart text 
Changed "No injuries on bodypart" to still display if the generic messages have entries
 2015-04-03 20:26:24 +02:00
PabstMirror
254a25b139 Medical - isBeingDragged func 2015-04-03 13:16:48 -05:00
Glowbal
b92978fb80 Now resets the proper hasMovedOut value 2015-04-03 20:11:20 +02:00
Glowbal
e68e487769 fixed units not moving out of unconscious animation 2015-04-03 20:07:39 +02:00
Glowbal
d5f0cf5cbd Incorrect value for airwayStatus 2015-04-03 20:06:53 +02:00
jaynus
ced44f8a9d Fixed: Reduce bouncing. 
TODO: wtf is going on with the lateral axis?
TODO: maybe dummy laser that doesnt show up as a target.
 2015-04-03 10:34:36 -07:00
commy2
025c1ef63f simplify optics 2015-04-03 19:25:28 +02:00
jaynus
368b51e0ee Fixed: Get in/out of vehicle automatically turns off lasers 2015-04-03 10:10:57 -07:00
Glowbal
14e00940cd fixed incorrect airwayStatus values for initialization (adv medical) 2015-04-03 18:59:22 +02:00
esteldunedain
d1d6252299 Nerf the backblast damage of the Titan and NLAW, adopting standard values for soft-launch launchers from the AGM_Compatibility project 2015-04-03 13:50:47 -03:00
jaynus
ca8537105f Merge branch 'lasers' of github.com:KoffeinFlummi/ACE3 into lasers 2015-04-03 09:49:56 -07:00
jaynus
84d801a45a Added: ace_fcs_forceUpdate event for forcing the FCS to update from self-designate 
Merged: in-vehicle interact for laser designator
Changed: Perf. tweaks on laser update times.
 2015-04-03 09:49:41 -07:00
esteldunedain
b0ac672c13 Only init each vehicle type once 2015-04-03 13:24:50 -03:00
jaynus
63c42e26c8 Merge branch 'lasers' of github.com:KoffeinFlummi/ACE3 into lasers 2015-04-03 09:16:03 -07:00
jaynus
f87ea5fe1c Merge branch 'lasers' of github.com:KoffeinFlummi/ACE3 into lasers 2015-04-03 09:03:14 -07:00
commy2
b0575bad21 improve infoDisplayChanged EH 2015-04-03 17:50:52 +02:00
esteldunedain
b7e3a94462 Add designator to the comanche's gunner 2015-04-03 12:44:09 -03:00
esteldunedain
c82cef1b28 - self designate capabilities read from config 
- add designator on/off actions to the interact_menu
 2015-04-03 12:43:41 -03:00
Nicolás Badano
63ac3bb768 Merge branch 'master' into lasers 
Conflicts:
	addons/common/XEH_preInit.sqf
 2015-04-03 10:40:11 -03:00
Glowbal
1d7f351cb5 Merge pull request #288 from KoffeinFlummi/Banana 
Added banana to curator item list
 2015-04-03 12:56:37 +02:00
Glowbal
4478602cfb Consistent use of quotes for localized text 2015-04-03 12:56:12 +02:00
commy2
6d3ddfeb5e 2d scripted optics 2015-04-03 12:33:12 +02:00
Garth L-H de Wet
7c73f7479e Used a more suitable icon for taking explosives. 2015-04-03 09:51:32 +02:00
Glowbal
8226edc6cb Fixed module function call 
Wind deflection module was using the incorrect function name,
 2015-04-03 09:43:06 +02:00
Glowbal
368002cc79 fixed undefined _selectionName variable #289 2015-04-03 08:48:10 +02:00
Glowbal
ffcc01ef74 Removed rouge systemChat message on unconsciousness #292 2015-04-03 08:45:02 +02:00
PabstMirror
98428c42f5 #291 - RemoveDeadBodiesDisconnected 2015-04-03 01:05:14 -05:00
PabstMirror
33ee7dc07c iMenu - Add some localization and fix veh icons 2015-04-03 00:42:25 -05:00
PabstMirror
e99e35d70b mdagr - remove unneeded error msg 2015-04-02 22:37:00 -05:00
PabstMirror
7c121e6a80 Missing, unused stringtable 2015-04-02 22:32:16 -05:00
jaynus
19bc75dacd Merge remote-tracking branch 'origin/ballistics_effects' into lasers 2015-04-02 16:44:00 -07:00
jaynus
8a18d18c08 doubleplusgood all munition TTL for range. 2015-04-02 16:35:19 -07:00
Glowbal
2d0e8dea7e Added banana to curator item list 2015-04-03 01:27:22 +02:00
jaynus
6864529d9c Fixed: numerous player-based events were repeat invalid firing for null player object. This is now limited to only appropriate null-friendly events. 2015-04-02 16:20:22 -07:00
jaynus
d81d1b3176 Added: ACE Event stack debugging output, use DEBUG_EVENTS in main\script_debug 
Added: PFH Perfcounter tracking+output, use ENABLE_PERFORMANCE_COUNTERS in main\script_debug and then call ace_common_fnc_dumpPerformanceCounters
 2015-04-02 16:05:21 -07:00
commy2
ba00a31523 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-03 00:41:43 +02:00
commy2
3b23006797 fix error when aborting mission 2015-04-03 00:41:11 +02:00
PabstMirror
1c66cb9818 StaticWeapon classname 2015-04-02 17:25:05 -05:00
Glowbal
045ea02da0 Changed: CPR is now only possible when a unit is in cardiac arrest (Adv) 2015-04-03 00:10:12 +02:00
Glowbal
b399768798 Changed postInit wound sync to playerChanged eventhandler. 2015-04-03 00:04:41 +02:00
commy2
88b9d0899f shortdot scope onDraw 2015-04-03 00:03:08 +02:00
Glowbal
c174ccf396 fixed script error when performing treatment with secondary weapon selected 2015-04-02 22:58:00 +02:00
Glowbal
57b093f845 Added minimum lethal damage for injury types in adv medical 2015-04-02 22:57:35 +02:00
Glowbal
b267a52ec6 Fixed support for custom damage types 2015-04-02 22:57:02 +02:00
Glowbal
6f4b53ed9e Correct use of medical handleDamage calls 2015-04-02 22:56:23 +02:00
Glowbal
6f630d4c03 Changed setUnconscious contract to support a minimum unconscious time 2015-04-02 22:55:23 +02:00
Glowbal
c6c04442c1 GForces now uses correct unconscious function 2015-04-02 22:54:39 +02:00
commy2
646a4b5bd1 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-02 22:40:47 +02:00
commy2
35ad71bbfd add testing scope 2015-04-02 22:40:21 +02:00
Garth L-H de Wet
703bc24657 Made picking up explosives use the new AddToInventory function from common. 2015-04-02 21:44:33 +02:00
Garth L-H de Wet
1e8a8e79fe Merge branch 'master' into explosiveInteraction 2015-04-02 21:30:08 +02:00
jaynus
b88d1b4cac Begin time to live changes for extended range rounds. 2015-04-02 10:45:52 -07:00
jaynus
0ca1703048 Slight tweak to deflection. 2015-04-02 10:41:54 -07:00
jaynus
596854a264 Moved getTurretDirection to common. 
Tweak creation of action (fucking actions?!) :( :( :(
 2015-04-02 10:05:50 -07:00
jaynus
c83e602028 Merge remote-tracking branch 'origin/master' into lasers 2015-04-02 09:35:51 -07:00
jaynus
ec64a1b0ca Changed: Laser functionality tweaking 
Changed: DAGR deflection refinement
Clean up of tabs
 2015-04-02 09:35:36 -07:00
PabstMirror
ec59397e4f Fix playerTurretChanged event 2015-04-02 11:15:31 -05:00
jaynus
b0926a542c Merge pull request #282 from KoffeinFlummi/AddItemToInventory 
Added a function that will add the passed item to the unit or place it i...
 2015-04-02 08:42:48 -07:00
commy2
f2d802eb90 make getGunner work in person turret turret units (commander FFV) and for foot soldiers 2015-04-02 13:52:22 +02:00
commy2
d8e0c54406 function to log ace config entries 2015-04-02 10:27:21 +02:00