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
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
commy2
2fd2e313f2 sort stuff 2015-04-02 08:44:58 +02:00
commy2
8fde553731 getItemType more relyable after potential arma updates 2015-04-02 08:16:13 +02:00
commy2
191126ecd6 update getItemType 2015-04-02 07:37:44 +02:00
PabstMirror
a92a541234 Headers 2015-04-01 23:05:41 -05:00
jaynus
cc27ff63d6 finalized. works for weapons/mags/items. Optional container also works. 2015-04-01 16:51:34 -07:00
jaynus
5d6495dafe Merge remote-tracking branch 'origin/master' into AddItemToInventory 2015-04-01 16:42:24 -07:00
PabstMirror
c9352e1970 And This 2015-04-01 15:18:39 -05:00
commy2
411fb6bc62 getText vs. getNumber 2015-04-01 22:13:37 +02:00
PabstMirror
4e66aea25d Make it work 2015-04-01 15:09:05 -05:00
commy2
a14cc0853e function to return item type 2015-04-01 21:52:56 +02:00
Garth L-H de Wet
452947148a Random clean ups and explosive can now detonate with their object. 
Defuse object doesn't get cleaned up on it's own. But if a player comes near it with interact menu on it will get cleaned up.
 2015-04-01 20:43:18 +02:00
PabstMirror
1303f59cd8 opps 2015-04-01 13:09:22 -05:00
PabstMirror
0d27806571 Repack Mag Child Actions 2015-04-01 13:09:03 -05:00
Glowbal
7252966a78 Replaced advanced wounds event sync by regular setvariable public 2015-04-01 20:03:44 +02:00
Glowbal
635f3e31c9 Disable medical carry and drag 2015-04-01 19:56:00 +02:00
jaynus
bd1f69d8a2 assign container 2015-04-01 10:37:47 -07:00
commy2
b66bb4ffd6 add functions to get cfg type of items and objects 2015-04-01 19:36:11 +02:00
jaynus
46a761a1c8 canAdditem works on weapons. 2015-04-01 10:35:22 -07:00
jaynus
de920e8874 Final cleanup. 2015-04-01 10:34:38 -07:00
jaynus
ec6fb6fcb8 containerize. 2015-04-01 10:34:16 -07:00
jaynus
c3f915a0ac tabs because 2015-04-01 10:22:27 -07:00
jaynus
37bbbc607f derp. 2015-04-01 10:20:58 -07:00
jaynus
46284622b3 Optional container variable for adding item to a specific container (vest/backpack/uniform) 2015-04-01 10:20:24 -07:00
Garth L-H de Wet
7d5555a2e0 Renamed functions to be more inline with their purpose. 
Removed legacy code.
 2015-04-01 19:09:19 +02:00
Garth L-H de Wet
e06e7a2a51 Added a function that will add the passed item to the unit or place it in a ground holder if the unit has no space. 2015-04-01 18:48:46 +02:00
PabstMirror
43a9e7bfc8 #176 - Belt Repacking 2015-04-01 11:21:30 -05:00
PabstMirror
0daa029622 Show Vehicle Name/Icon for interaction 2015-03-31 23:56:41 -05:00
PabstMirror
41489e271c Merge pull request #261 from KoffeinFlummi/attachCleanup 
Attach cleanup
 2015-03-31 19:46:25 -05:00
Nicolás Badano
0d8bd0bc80 Merge pull request #279 from KoffeinFlummi/fixesInteractionConditions 
Fixed various interaction conditions
 2015-03-31 20:10:05 -03:00
Garth L-H de Wet
c020128f0e Made explosives use children action points rather than the listbox at all points. 
Added the ability to defuse on explosives. "on explosives", there is a helper object that handles defusing.

Known issue, it appears that the attachTo explosives don't detonate. This means the currently approach should be changed to a object variable method, instead of an attached object method.
 2015-03-31 23:20:32 +02:00
Nicolás Badano
e38f48d7ad Remove debug stuff 2015-03-31 18:16:53 -03:00
Nicolás Badano
1def2bd2b4 Fix bugs with interaction with vehicles and passengers 2015-03-31 18:09:29 -03:00
Nicolás Badano
4381f164d1 Fix the self interaction menu of vehicles 2015-03-31 18:09:23 -03:00
Nicolás Badano
149fd13fce Prevent the interact menu from closing dialogs opened by the actions 2015-03-31 18:09:20 -03:00
Nicolás Badano
9a182b98b6 Fix the FCS keybinds 2015-03-31 18:09:14 -03:00
Garth L-H de Wet
613257141b Merge branch 'removedExpPlaceMenu' into explosiveInteraction 
Conflicts:
	addons/explosives/CfgVehicles.hpp
	addons/explosives/functions/fnc_openPlaceUI.sqf
 2015-03-31 19:29:09 +02:00
Garth L-H de Wet
8158a3e841 Fixed small errors caused by working blind. 2015-03-31 19:26:38 +02:00
Garth L-H de Wet
9c13a87d83 Merge branch 'master' into explosiveInteraction 2015-03-31 17:21:55 +02:00
Garth L-H de Wet
37fe824426 Added pickup action to put down explosives. 2015-03-31 17:12:12 +02:00
PabstMirror
146812b5e6 Dragging - Detect static weapon disassembled 
Static weapons can still be disassembled at any time during dragging.
This just adds a simple distance check and drops if object moves away
from player.
 2015-03-30 21:51:11 -05:00
Nicolás Badano
1e0ece9fa2 Revert "Revert "1.42 - cursor mode when bipod deployed"" 2015-03-30 17:32:55 -03:00
Nicolás Badano
d9bfb84675 Revert "1.42 - cursor mode when bipod deployed" 2015-03-30 17:31:50 -03:00
Nicolás Badano
a7f1e58dcf Merge pull request #272 from KoffeinFlummi/142menudeploy 
1.42 - cursor mode when bipod deployed
 2015-03-30 17:26:18 -03:00
PabstMirror
ee961ed1e6 Fix Dropping Unique Magazines 2015-03-29 14:47:57 -05:00
PabstMirror
e65d74f43d Merge branch 'master' into disarmingTest 2015-03-29 14:41:15 -05:00
commy2
d2e6d5887a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-03-29 21:23:20 +02:00
commy2
54369b772f fix: crate instantly drops when trying to pick up with lowered weapon 2015-03-29 20:46:29 +02:00
PabstMirror
1e2b47d6e7 Wirecutters - use new createAction system 2015-03-29 12:08:01 -05:00
PabstMirror
24b47584a2 InteractMenu - Fix Actions Added to Objects 2015-03-29 12:04:57 -05:00
PabstMirror
209bdc8dfd Merge pull request #257 from KoffeinFlummi/captivesFixRespawn 
Captives fix respawn Fix #230
 2015-03-29 11:23:33 -05:00
commy2
6ca84c3d31 delete obsolete ammo configs 2015-03-29 14:25:13 +02:00
commy2
33f0ff9b82 1.42 ensure ace is loaded after marksmen configs 2015-03-29 14:19:01 +02:00
commy2
4a9124c170 changed behavior of silencers from Marksmen 2015-03-29 14:09:51 +02:00
PabstMirror
95a9daf18b Minor Header Correction 2015-03-28 19:08:25 -05:00
commy2
e574d19844 1.42 - cursor mode when bipod deployed 2015-03-28 16:24:17 +01:00
commy2
c3b9d42834 prepare realistic names for marksman 2015-03-28 12:39:51 +01:00
commy2
b10d3b26ce replace variables with new scripting commands 2015-03-28 11:23:13 +01:00
commy2
6c8064097f delete old resting, farewell 2015-03-28 11:19:39 +01:00
commy2
86e5896c73 intendation 2015-03-28 09:05:58 +01:00
commy2
d959aa1619 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-03-28 08:38:37 +01:00
commy2
53aaeaacd5 fix #263 2015-03-28 08:38:16 +01:00
commy2
23cd523108 fix more inheritance 2015-03-28 08:06:08 +01:00
commy2
853c4d8dca 142 - fix inheritance changes 2015-03-28 07:50:52 +01:00
PabstMirror
40ccf7b241 Captives - Should disable reloading 2015-03-28 01:46:13 -05:00
commy2
772551cbb3 fix broken hungarian string 2015-03-28 07:39:23 +01:00
commy2
d7aaead032 remove obsolete function for channel 2015-03-28 07:04:50 +01:00
commy2
7486ae3036 ace_common_fnc_currentChannel is no longer relyable 2015-03-28 06:55:46 +01:00
PabstMirror
4e4834974a cleanup debug 2015-03-27 23:26:41 -05:00
PabstMirror
aa5a580645 Cleanup 2015-03-27 23:24:11 -05:00
PabstMirror
909f53753a Fix JIP Marker SYnc 2015-03-27 23:19:03 -05:00
PabstMirror
e5cbca02e4 Show placement angle in preview 2015-03-27 22:55:19 -05:00
PabstMirror
24bba5dea6 Headers 2015-03-27 20:51:30 -05:00
commy2
e7ec618f97 function decription 2015-03-28 02:10:04 +01:00
commy2
d12ba196c5 function to return attachments, muzzles with magazines and ammo, moved stuff around 2015-03-28 01:43:30 +01:00
PabstMirror
63b7f0a755 Marker Fixes for 1.42 WIP 2015-03-27 19:22:49 -05:00
commy2
66c026d4a0 refueling the uav didn't work on UAVs local to server or HC 2015-03-28 00:30:51 +01:00
PabstMirror
1695837e0c 1.42 Inventory Config 2015-03-27 13:10:55 -05:00
commy2
5f1201d75a fix unexpected stringtable format 2015-03-27 19:08:01 +01:00
PabstMirror
47c72ac4ae Disable Debug Laser / Commenting 2015-03-27 12:08:05 -05:00
PabstMirror
4d62865ea2 Stop placement on interact_menu open 2015-03-27 11:53:04 -05:00
PabstMirror
91a1ed3264 Cancle attach action 2015-03-27 11:36:31 -05:00
PabstMirror
86c7776802 and this 2015-03-27 11:14:19 -05:00
PabstMirror
f43666eb93 Use CBA PFEH instead of BI stacked 2015-03-27 11:14:04 -05:00
Glowbal
7a091215e1 Draft #188 2015-03-27 16:26:18 +01:00
PabstMirror
51e8dbf53f misc 2015-03-27 00:12:39 -05:00
PabstMirror
d03e474075 Replace selection dialog with interact children 2015-03-27 00:02:54 -05:00
PabstMirror
efe57461b5 misc 2015-03-26 20:05:30 -05:00
Glowbal
4336cf0fc1 Merge pull request #258 from KoffeinFlummi/BananaPort 
Banana
 2015-03-27 00:04:53 +01:00
PabstMirror
9ae4f39d05 Binary Seach for attach pos 2015-03-26 17:49:11 -05:00
Glowbal
f652ae89d1 Banana 2015-03-26 23:14:22 +01:00
PabstMirror
559f0dbaea Unconc - dropping object handled in dragging 2015-03-26 16:32:44 -05:00
PabstMirror
6a71a04ad9 opps 2015-03-26 15:52:30 -05:00
PabstMirror
de644ba9b0 Medical - Reset captive status for respawning unit 2015-03-26 15:49:08 -05:00
PabstMirror
048be00a0f Medical - QGVAR(isUnconscious) -> "ACE_isUnconscious" 2015-03-26 15:47:08 -05:00
PabstMirror
2eefb1265d Medical - morphine icon for left leg 2015-03-26 15:16:28 -05:00
PabstMirror
3f137d357d Medical - carryObj func moved 2015-03-26 15:05:50 -05:00
PabstMirror
14cbceef97 Rerun set func when respawn into captive unit 2015-03-26 14:21:26 -05:00
commy2
9fcb193064 Merge pull request #243 from KoffeinFlummi/mediccarry 
refining carrying injured persons
 2015-03-26 18:04:35 +01:00
commy2
e129d139d7 indentation 2015-03-26 18:03:13 +01:00
commy2
355dfc0988 Merge pull request #254 from KoffeinFlummi/noidle 
remove idle animations for players with lowered weapon
 2015-03-26 18:01:20 +01:00
commy2
c68430cb38 Merge pull request #255 from KoffeinFlummi/norearm 
hide rearm action for players
 2015-03-26 18:01:01 +01:00
commy2
d9e59aba3e Merge pull request #256 from KoffeinFlummi/hitreactions 
fall down after getting shot while moving
 2015-03-26 17:56:51 +01:00
commy2
0a0e7c8a0c disable user input was broken 2015-03-26 17:32:00 +01:00
commy2
9a0f0cb47b stuff from medical 2015-03-26 16:58:41 +01:00
commy2
cf2b7d3bfb private 2015-03-26 15:19:13 +01:00
commy2
20dd8f34fc fall down after getting shot while moving 2015-03-26 15:06:51 +01:00
commy2
164e8f95c9 hide rearm action for players 2015-03-26 14:14:56 +01:00
commy2
6317dccb52 Revert "hide rearm action for the player" 
This reverts commit a2d4de605b.
 2015-03-26 14:13:16 +01:00
commy2
a2d4de605b hide rearm action for the player 2015-03-26 14:11:06 +01:00
commy2
606c1fbcf9 tweaks 2015-03-26 14:11:04 +01:00
commy2
0b05a2bfb2 speed up some debug functions by 99.99% 2015-03-26 14:11:01 +01:00
commy2
816b1d74ad tweak, pushBack vs + Array 2015-03-26 14:10:59 +01:00
commy2
97ae218288 adjust functions to new syntax 2015-03-26 14:10:56 +01:00
commy2
dea830441b tweak turret functions 2015-03-26 14:10:53 +01:00
commy2
6b9b3bc6bd remove idle animations for players with lowered weapon 2015-03-26 13:21:16 +01:00
Glowbal
6a1dfe00da Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-26 08:43:48 +01:00
Glowbal
9f540e0473 fixed Missing unconcious effects #253 2015-03-26 08:43:30 +01:00
PabstMirror
d4d0a0a6de Make sure to remove animEH 2015-03-26 00:53:38 -05:00
PabstMirror
811530f180 Ensure captiveNum is reset for respawning unit 2015-03-26 00:53:02 -05:00
commy2
91b63fbb7d tweaks 2015-03-26 03:20:17 +01:00
commy2
6a0ca8590f speed up some debug functions by 99.99% 2015-03-26 02:26:09 +01:00
commy2
cb29f1a6c9 tweak, pushBack vs + Array 2015-03-26 01:58:49 +01:00
commy2
288c79fb46 Merge pull request #251 from KoffeinFlummi/turrettweak 
tweak turret functions
 2015-03-25 23:38:39 +01:00
commy2
b613ab8630 adjust functions to new syntax 2015-03-25 23:03:45 +01:00
commy2
80349658d6 tweak turret functions 2015-03-25 22:50:28 +01:00
Glowbal
eb80831525 fixed script error with medical display patient information after check response 2015-03-25 22:18:52 +01:00
commy2
e007a247d8 detach when entering a vehicle, don't mess up animation insidea vehicle 2015-03-25 21:51:50 +01:00
commy2
01b7d3b213 global setDir on attachTo 2015-03-25 20:45:47 +01:00
commy2
3634eaf568 tweak carry stance req., timeout certain PFH, exit PFH, debug 2015-03-25 20:18:23 +01:00
bux578
02141a2947 add microDAGR to weapons array 2015-03-25 18:23:01 +01:00
bux578
1f3c3ce34b fixed spelling of engl. autoinjector 
http://en.wikipedia.org/wiki/Epinephrine_autoinjector
 2015-03-25 18:22:45 +01:00
commy2
39500110b5 remove disable command menu option - it does nothing 2015-03-25 15:14:22 +01:00
commy2
9b553c1134 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-03-25 15:07:42 +01:00
commy2
50c63b8fb9 don't overwrite input in weapon select, fix: weapon select didn't work in FFV 2015-03-25 15:06:47 +01:00
PabstMirror
a88908d795 Release autotrack when trying to drag map 2015-03-25 09:00:49 -05:00
PabstMirror
600c7aed97 Restore Interaction Icon 2015-03-25 08:57:44 -05:00
commy2
569a77d41b logic 2015-03-25 14:34:19 +01:00
commy2
0c8e8236dd logic 2015-03-25 14:32:36 +01:00
commy2
e1b5b96a7e derped the file 2015-03-25 14:09:49 +01:00
commy2
20882ed694 properly remove fake weapon after carrying persons 2015-03-25 14:07:50 +01:00
commy2
ebe9d7ed5f carrying unconscious persons 2015-03-25 13:32:59 +01:00
commy2
4ae3c22642 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into mediccarry 2015-03-25 11:08:13 +01:00
bux578
c44b944044 add missing icons 2015-03-25 06:32:08 +01:00
bux578
074bf4ba6d tab to space 2015-03-25 06:06:04 +01:00
bux578
4fecc1372f add microDAGR to ace misc box 2015-03-25 06:05:06 +01:00
Glowbal
b6133eb73e removed diag_log calls 2015-03-24 23:10:03 +01:00
Glowbal
3b17cc68e1 medical_onUnconscious is now a globalEvent instead of targetEvent. 
Feature request by commy.
 2015-03-24 22:10:41 +01:00
Glowbal
975ad5a399 Merge branch 'master' into medical-fixes 
Conflicts:
	addons/medical/CfgVehicles.hpp
 2015-03-24 22:07:15 +01:00
Glowbal
706e159815 Adjusted color of tourniquet message 2015-03-24 22:01:33 +01:00
Glowbal
2f729f67f1 Slightly increased the distance of medical actions 
Removed sub menu medical on torso
 2015-03-24 21:41:03 +01:00
commy2
655f23b53c start carrying phase 2015-03-24 21:37:27 +01:00
Glowbal
7420f70020 Fixed #232 2015-03-24 21:26:20 +01:00
Glowbal
95489ed627 fixed missing handleDamage EH #235 2015-03-24 21:25:21 +01:00
Glowbal
53e7fe1ba5 fixed #227 2015-03-24 21:08:45 +01:00
Glowbal
f175467813 fixed #241 and #228 2015-03-24 21:08:13 +01:00
commy2
12062c0e25 deleting obsolete stuff in common 2015-03-24 20:32:13 +01:00
commy2
34df28d938 cleaning up common 2015-03-24 20:28:44 +01:00
commy2
53a61eb001 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into mediccarry 2015-03-24 20:10:11 +01:00
Nicolás Badano
77dc50f10f Some more fixes for self interaction inside vehicles 2015-03-24 16:06:03 -03:00
Nicolás Badano
4fb50fa71e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-24 15:44:10 -03:00
Nicolás Badano
8b3648cf8d Configure exceptions for self actions inside vehicles 2015-03-24 15:43:49 -03:00
bux578
7744d5b5fb fix authors #2 2015-03-24 19:43:06 +01:00
bux578
05896a55ea fix authors 2015-03-24 19:40:48 +01:00
bux578
60c50e0daf Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons 2015-03-24 19:12:23 +01:00
commy2
749352f0a8 animations, onUnconscious events 2015-03-24 19:07:39 +01:00
commy2
941d98a88d disable all self actions inside vehicles on default 2015-03-24 16:45:10 +01:00
Nicolás Badano
a1d6c052ba Refactored interaction key handling while boarded: 
- Self-interaction key opens up your own self interaction menu
- Interaction key opens interaction options of the vehicle and passengers
 2015-03-24 12:27:27 -03:00
commy2
43846970fa init drag/carry options on persons 2015-03-24 16:12:46 +01:00
commy2
bdc60c074a cleaning up in common 2015-03-24 16:01:53 +01:00
PabstMirror
82042f85f4 Wirecutters: fix error on end mission with keydown 2015-03-24 04:03:16 -05:00
PabstMirror
8346de8150 vehLock disable debug rpt spam 2015-03-24 04:01:20 -05:00
PabstMirror
3ab033065f #233 - Clean up mDAGR interaction menu 
Adds exception to use on map (also for base ACE_equipment)
selfInteract has 3 options [close, show minimap, show dialog] (only 2
possible shown at any time)
Keybinds are just toggle and close
 2015-03-24 03:50:06 -05:00
Nicolás Badano
5e79970740 Switching nicknames 2015-03-24 01:18:00 -03:00
Nicolás Badano
bc0dae63ca Fix #173 2015-03-24 00:57:03 -03:00
Nicolás Badano
58ea333b42 Fix #236 2015-03-24 00:34:41 -03:00
Nicolás Badano
8767a0d6ac Fix #206 2015-03-24 00:30:15 -03:00
Nicolás Badano
a823fb2dca Tweaks on action names to: 
- Remove >> for submenus
- Split long action names in two lines
 2015-03-24 00:16:32 -03:00
Nicolás Badano
17d0c0ae38 Various tweaks on interact_menu styling to improve usability 2015-03-24 00:15:22 -03:00
Nicolás Badano
70ffefde10 Possibly close multiple dialogs when interact_menu is opened 2015-03-23 21:26:40 -03:00
Nicolás Badano
65d3e312d1 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-23 20:03:08 -03:00
Nicolás Badano
f64092f09c Close dialogs when pressing the interaction k 2015-03-23 20:02:30 -03:00
PabstMirror
ed3fc5919f #231 - Close DAGR if player dead/null 2015-03-23 17:34:40 -05:00
Nicolás Badano
50f5e2c858 Change the interact_menu selector to be a control. Makes it work reliably when surrendered 2015-03-23 19:16:10 -03:00
Nicolás Badano
a432f74a6b Make self interact_menu finally work on the map screen!! 2015-03-23 18:26:20 -03:00
Nicolás Badano
75a09357aa Properly configure canInteractWith and exceptions for self interaction 2015-03-23 18:08:58 -03:00
Nicolás Badano
eb557bf777 Make interac_menu work in real 2D: 
- Children positions are calculated directly on screen space
- Saves a lot of worldToScreen, ATLtoASL, etc calls
- Selector is now a control instead of a 3D icon
 2015-03-23 18:08:31 -03:00
PabstMirror
20362e8dc9 Cleanup exception names 2015-03-23 15:22:26 -05:00
PabstMirror
ef3b411c6c Close dagr when dropping item 2015-03-23 15:02:20 -05:00
Nicolás Badano
ba9fce8636 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-23 16:53:56 -03:00
Nicolás Badano
dbbfdd88df Forgotten line 2015-03-23 16:53:28 -03:00
bux578
ba42ec831b second batch of icons 2015-03-23 20:02:35 +01:00
PabstMirror
17eddb089b Missing Semicolon 2015-03-23 13:57:16 -05:00
PabstMirror
2329212060 Medical Action Stringtable 2015-03-23 13:52:26 -05:00
PabstMirror
14d6db4596 Merge pull request #183 from KoffeinFlummi/microDAGR 
MicroDAGR
 2015-03-23 13:24:37 -05:00
bux578
cdb6a1f947 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons 2015-03-23 18:43:00 +01:00
Nicolás Badano
c8b6f6dc78 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-23 14:02:06 -03:00
Nicolás Badano
bf1d808b82 Small optimizations on interact_menu 2015-03-23 14:01:38 -03:00
Nicolás Badano
1e5a194bf6 Optimize ace_common_fnc_toHex 2015-03-23 12:16:50 -03:00
bux578
1114e12186 add first batch of module icons, naming conventions 2015-03-23 13:56:59 +01:00
PabstMirror
d6ad0e15b4 Move wep_dragon to toMerge 
Always throws error during compile
Has multiple references to Arma2 assets.
 2015-03-22 17:34:28 -05:00
Glowbal
15edb0bff2 fixes 2015-03-22 23:24:24 +01:00
Glowbal
d7de92c60d Merge branch 'master' into Medical_Dragging 
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/XEH_preInit.sqf
 2015-03-22 22:41:36 +01:00
Glowbal
9e43ab5c25 Merge branch 'master' into medical-advanced 2015-03-22 22:37:37 +01:00
Glowbal
df43b7fd2d Merge branch 'master' into medical-jip-fixes 
Conflicts:
	addons/medical/CfgVehicles.hpp
 2015-03-22 22:35:32 +01:00
Glowbal
4ff849c2fd Merge branch 'master' into medical-advanced 2015-03-22 22:34:07 +01:00
Glowbal
c7b505a31c Merge pull request #218 from KoffeinFlummi/pre-postInit-module-exec 
Pre-postInit module execution
 2015-03-22 22:33:32 +01:00
Glowbal
1bb32dcfcb fixed missing condition variable 2015-03-22 22:20:44 +01:00
Glowbal
1aa2425c1e Merge branch 'master' into Medical_Dragging 2015-03-22 21:07:26 +01:00
Glowbal
4995016a66 Switched to canInteractConditions 2015-03-22 20:59:57 +01:00
Glowbal
7bc6fa3c3b Disable interaction for objects 2015-03-22 20:39:22 +01:00
Glowbal
6eac193825 Replaced deleting of body by hiding it 2015-03-22 20:37:55 +01:00
commy2
84dbeb19d1 fix: timeout could cause being stuck with attached item 2015-03-22 17:35:26 +01:00
Glowbal
2d2687e759 Added self interact items 2015-03-22 17:28:48 +01:00
commy2
11bb1a050a fix: could drag and carry object at the same time 2015-03-22 17:12:14 +01:00
Glowbal
dd7dad1b90 define base class 2015-03-22 17:05:31 +01:00
Glowbal
f252b2c96f advanced medical JIP improvements 2015-03-22 17:04:42 +01:00
commy2
c243513227 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-03-22 16:38:38 +01:00
commy2
e1200f8753 fix: release action didn't show up 2015-03-22 16:38:21 +01:00
Glowbal
694ab7d51e Merge branch 'master' into pre-postInit-module-exec 2015-03-22 15:17:24 +01:00
Glowbal
8b4c0c0e36 fixed postInit depending on setting 2015-03-22 15:16:42 +01:00
commy2
4607fd8605 localization 2015-03-22 14:42:47 +01:00
commy2
f734aeee95 reload launcher mag progress bar 2015-03-22 14:05:31 +01:00
Glowbal
be9c09b605 Added cfgPatches dependancy on ace_modules 2015-03-22 12:49:04 +01:00
Glowbal
7ceaf7907a Indentation 2015-03-22 12:45:46 +01:00
Glowbal
281bad1e7e Use of the ACE module instead of Module_F. 2015-03-22 12:44:26 +01:00
Glowbal
73489a7795 PBOPREFIX 2015-03-22 12:39:49 +01:00
Glowbal
d7e43ce28e First draft 2015-03-22 12:39:26 +01:00
Glowbal
55e7e768ca removed systemChat messages 2015-03-22 11:21:17 +01:00
Glowbal
5063e9cff9 fixed config duplicate entry 2015-03-22 11:21:08 +01:00
commy2
ae5fbaef86 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into reloadLaunchers 2015-03-22 10:48:54 +01:00
Glowbal
ac4309237b Added drag/carry actions 2015-03-22 10:28:41 +01:00
Glowbal
0428a1d558 Added canDrag 2015-03-22 10:28:33 +01:00
Glowbal
7b519fc2e0 Merge branch 'master' into Medical_Dragging 
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/stringtable.xml
 2015-03-22 09:46:58 +01:00
Nou
12cadc603f Fragmentation enabled. 2015-03-21 21:22:16 -07:00
Nicolás Badano
08eb40a606 Merge pull request #209 from KoffeinFlummi/disposableCleanup 
Disposable cleanup
 2015-03-21 20:44:38 -03:00
Nicolás Badano
5dcf29ba80 Merge pull request #212 from KoffeinFlummi/interactivePelvis 
Move main interactions to pelvis; leave torso for medical
 2015-03-21 20:44:18 -03:00
Nicolás Badano
32be87806b Clear the caches again after performing the action, cause it's very possible something changed as a result. 2015-03-21 20:37:01 -03:00
Nicolás Badano
6a83d0d9fc clear canTreat caches before calling the last condition 2015-03-21 20:33:25 -03:00
Nicolás Badano
323aa156d1 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into clearCacheOnEvents 2015-03-21 20:31:01 -03:00
Nicolás Badano
2beb1a289e Ensure the condition of the action is always checked uncached before calling the statement. 2015-03-21 20:30:27 -03:00
Nicolás Badano
71c79e7785 Merge pull request #214 from KoffeinFlummi/clearCacheOnEvents 
Added to cachedCall an option to clear the cache on an event
 2015-03-21 20:15:10 -03:00
PabstMirror
3a6995fbec Cleanup medical Item classnames 2015-03-21 18:07:50 -05:00
Felix Wiegand
be4f21ea2e Merge pull request #215 from KoffeinFlummi/medical-itemcheck 
Medical itemcheck
 2015-03-21 22:41:06 +01:00
Glowbal
a7d8914884 Removed GVAR/QGVAR from items 2015-03-21 22:22:28 +01:00
commy2
1bf13cea34 remove obsolete camera eh from agm 2015-03-21 22:13:36 +01:00
Nicolás Badano
87b1458dc0 Fix debug stuff 2015-03-21 18:09:42 -03:00
Glowbal
b74eb550b0 Added advanced items 2015-03-21 22:08:42 +01:00
KoffeinFlummi
58237751b0 Woopsie 2015-03-21 22:01:20 +01:00
KoffeinFlummi
f6f910fb8a Replace vanilla items with ours. 2015-03-21 21:59:08 +01:00
commy2
1b8a9290cd remove obsolete custom eh from agm 2015-03-21 21:56:22 +01:00
commy2
cefd8d5c54 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-03-21 21:51:48 +01:00
commy2
1d4249a825 macros 2015-03-21 21:51:27 +01:00
Nicolás Badano
213b817947 Added to cachedCall an option to clear the cache on an event 2015-03-21 17:50:35 -03:00
Glowbal
d73f16861b Merge pull request #213 from KoffeinFlummi/medical-advanced 
Medical advanced
 2015-03-21 21:02:35 +01:00
Nicolás Badano
ce3ed988a2 Removed debug traces 2015-03-21 16:33:59 -03:00
Glowbal
89daf840f6 fixed incorrect macro 2015-03-21 20:08:52 +01:00
Nicolás Badano
4e32e584be Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-21 15:33:36 -03:00
Nicolás Badano
f8ea603977 Added dynamic actions to unload patients (unconscious) from vehicles 2015-03-21 15:32:32 -03:00
PabstMirror
9578024693 Dupe stringtable entry 
`Item STR_ACE_MEDICAL_BANDAGING listed twice`
 2015-03-21 12:52:08 -05:00
Nicolás Badano
274dae9a02 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-21 14:28:33 -03:00
Nicolás Badano
dbb9765035 Fix isSubPath 2015-03-21 14:28:17 -03:00
PabstMirror
054f21eede +2more 2015-03-21 12:18:19 -05:00
PabstMirror
e8112ada71 Merge branch 'master' into disarmingTest 2015-03-21 12:15:12 -05:00
PabstMirror
8a9ac4147f Update $PBOPREFIX$ 
Only getting error on server, not client
`Warning Message: Script z\ace\addons\gforces\XEH_preInit.sqf not found`
 2015-03-21 12:14:38 -05:00
Glowbal
7d6afdf1a9 Added triage card option 2015-03-21 17:30:49 +01:00
Glowbal
82ec93b84e Medical icons 2015-03-21 17:05:32 +01:00
Glowbal
7ae45fbeff Fixed canTreatCached 2015-03-21 16:47:51 +01:00
PabstMirror
0e6f76b50b Cannot drop attachements because of duplication 2015-03-21 10:35:21 -05:00
Glowbal
d0b14286ff Wrong function name 2015-03-21 16:34:42 +01:00
Glowbal
1d63e94fff canTreatCached 2015-03-21 16:33:14 +01:00
Glowbal
8de985d754 Added medical icons 2015-03-21 15:45:35 +01:00
Nicolás Badano
d7363a6dab Move main interactions to pelvis; leave torso for medical 2015-03-21 11:01:38 -03:00
Glowbal
4bcfd1a0ba Merge branch 'master' into medical-advanced 
Conflicts:
	addons/medical/functions/fnc_handleUnitVitals.sqf
 2015-03-21 14:54:37 +01:00
Felix Wiegand
8fac4b5798 Merge pull request #192 from KoffeinFlummi/medical-basic 
Basic Medical Tweaks
 2015-03-21 14:41:46 +01:00
Glowbal
946ade63e5 Merge branch 'master' into medical-advanced 2015-03-21 14:40:59 +01:00
Glowbal
ff5c8e911d Added InteractionMenuClosed event for closing the patient information display 2015-03-21 14:40:51 +01:00
Glowbal
77210581f5 Added corners to triage card 2015-03-21 14:40:26 +01:00
KoffeinFlummi
75517f7ce4 Replace setDamage with setDead 2015-03-21 14:40:23 +01:00
Nicolás Badano
f5f91c4802 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-21 10:24:01 -03:00
Nicolás Badano
83d9aa4bb6 Replace tap shoulder and check (others) ammo animations by PutDown 2015-03-21 10:23:36 -03:00
Nicolás Badano
9fd45fa707 Merge pull request #202 from KoffeinFlummi/vehLock-cleanup3 
Vehicle Lock Cleanup
 2015-03-21 09:51:47 -03:00
Nicolás Badano
4a8b5079a6 Fix #211 2015-03-21 09:37:01 -03:00
Nicolás Badano
4fe09034ff Merge branch 'master' into dynamicInteractMenu 2015-03-21 08:55:05 -03:00
Glowbal
7c30127ffb Disabled unimplemented medical systems 2015-03-21 10:55:40 +01:00
Glowbal
bc082783c9 check if unit is in a vehicle before checking the vehicle 2015-03-21 10:55:27 +01:00
Glowbal
b5c6e52416 fixed #201 2015-03-21 10:54:52 +01:00
Nicolás Badano
e7d7fa8e6c Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-21 00:27:41 -03:00
Nicolás Badano
14566c783b Prevent canInteractWith from throwing errors if third parameter is not supplied 2015-03-21 00:27:19 -03:00
Nicolás Badano
4210b175c3 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into dynamicInteractMenu 
Conflicts:
	addons/interact_menu/functions/fnc_compileMenu.sqf
	addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
 2015-03-21 00:16:52 -03:00
PabstMirror
0dcb1dfab8 GUI 2015-03-20 20:48:39 -05:00
PabstMirror
22483ce22e Fix ranks, and uniform/vest drop 2015-03-20 20:47:34 -05:00
Nicolás Badano
3d6660b115 Debug stuff 2015-03-20 22:44:36 -03:00
Nicolás Badano
b3aa7c8970 Make collectActiveActionTree follow mounts correctly 2015-03-20 22:44:25 -03:00
PabstMirror
52623f71b8 Use Inventory Scaling Option 2015-03-20 20:27:04 -05:00
PabstMirror
38745f4871 Various Changes 2015-03-20 20:17:49 -05:00
PabstMirror
f8e758e136 Merge branch 'master' into disarmingTest 2015-03-20 19:05:54 -05:00
KoffeinFlummi
a060e4bea5 Apply translations to epipen and morphine actions 2015-03-21 00:31:47 +01:00
KoffeinFlummi
b1ed80a23d Remove trailing whitespace in medical stringtable 2015-03-21 00:28:19 +01:00
KoffeinFlummi
510538bc53 Remove superfluous todo 2015-03-21 00:26:14 +01:00
KoffeinFlummi
88fb2765e3 Standardize actions across basic and advanced 2015-03-21 00:21:30 +01:00
PabstMirror
7e383dc10e #198 canInteractWith EGVAR -> EFUNC 2015-03-20 17:55:39 -05:00
KoffeinFlummi
6f8b5cc676 Fix missing dollar sign 2015-03-20 23:53:25 +01:00
KoffeinFlummi
fea63e597e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medical-basic 2015-03-20 23:48:42 +01:00
PabstMirror
8840284309 Fix progressBar 2015-03-20 17:46:21 -05:00
KoffeinFlummi
33d4bf2f5a Add localization for basic treatments and actions 2015-03-20 18:21:03 +01:00
KoffeinFlummi
9082712ff7 Replace Original with English keys in stringtable 2015-03-20 17:54:26 +01:00
KoffeinFlummi
66078a047b Wut. 2015-03-20 07:52:41 +01:00
Nicolás Badano
66731c9cdd First rough implementation of the passengers menu, with mounted main actions 2015-03-20 00:53:58 -03:00
Nicolás Badano
b854db0195 Updated interact_menu api calls on ace_dragging 2015-03-19 23:33:11 -03:00
Nicolás Badano
84bf44e026 Refactoring of interact_menu: 
- Reordering of action members
- Removed full path from actions, so they can be mounted under different paths if needed
- Added api for creating actions
- Api for adding actions for objects or classes
 2015-03-19 23:32:44 -03:00
PabstMirror
ad12904ca4 minor formating 2015-03-19 20:37:36 -05:00
PabstMirror
0c88b92eba Condense AI func, and drop attachements 2015-03-19 20:24:14 -05:00
PabstMirror
6e03bb6144 Merge branch 'master' into disposableCleanup 2015-03-19 19:37:10 -05:00
KoffeinFlummi
07570fccd4 Make isMedic even prettier 2015-03-19 22:34:12 +01:00
KoffeinFlummi
5589b80c70 Rewrite and fix isMedic 2015-03-19 22:27:12 +01:00
KoffeinFlummi
97082e4ce3 Simplify condition checking in canTreat. 2015-03-19 22:01:40 +01:00
KoffeinFlummi
69e0ebf107 Add injury texts 2015-03-19 21:31:56 +01:00
KoffeinFlummi
102d86d7d1 Merge remote-tracking branch 'origin/master' into medical-basic 2015-03-19 21:30:27 +01:00
Glowbal
3dda70a4af fixed variable name 2015-03-19 21:14:42 +01:00
Nicolás Badano
49cdf6512e Merge branch 'master' into dynamicInteractMenu 2015-03-19 15:09:31 -03:00
Nicolás Badano
b89e573005 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-19 15:08:53 -03:00
Nicolás Badano
b7c73f705c Interact menu usability improvements: 
- Submenu scale as a function of the number of children
- Added menu expansion animation to better communicate where the options come from
- Unused action point are faded as soon as the user hovers a certain action point
 2015-03-19 15:08:36 -03:00
Nicolás Badano
a3b913ad8b Interact menu usability improvements: 
- Submenu scale as a function of the number of children
- Added menu expansion animation to better communicate where the options come from
- Unused action point are faded as soon as the user hovers a certain action point
 2015-03-19 15:04:48 -03:00
Nicolás Badano
f96126153c Reenable hiding useless actions 2015-03-19 14:45:05 -03:00
Nicolás Badano
386fee4694 Replace place list menu by dynamically created actions 2015-03-19 13:31:45 -03:00
Nicolás Badano
acd3ca0d56 Interact menu: 
- Allow dynamically adding children actions just-in-time
- Added optional custom parameters for actions
 2015-03-19 13:00:10 -03:00
PabstMirror
81836d1bc1 semiColon 2015-03-19 03:10:33 -05:00
commy2
43defaee06 get compatible missiles fnc 2015-03-18 21:33:00 +01:00
PabstMirror
e57f007288 Match Ace_map's style 2015-03-18 14:39:04 -05:00
commy2
40eed0e12f reload event, some basic functions 2015-03-18 20:17:53 +01:00
PabstMirror
cd6a567ba3 Fix Icon 2015-03-18 13:50:27 -05:00
PabstMirror
7688384971 Merge branch 'master' into microDAGR 2015-03-18 13:46:57 -05:00
PabstMirror
396359ba67 Self Actions To Open (under equipment) 2015-03-18 13:46:39 -05:00
commy2
0be1959934 add reloadable launcher 2015-03-18 18:25:53 +01:00
Glowbal
42de257c6e Merge branch 'master' into Medical_Dragging 2015-03-18 18:21:05 +01:00
Glowbal
be4ba6144f Removed unnecessary line 2015-03-18 18:17:42 +01:00
commy2
4235bd8b91 restore lost files? 2015-03-18 17:57:55 +01:00
commy2
31db62a85d manual merge 2015-03-18 17:53:26 +01:00
commy2
1071284010 properly remove fake weapon, fix grabDrag action with fake weapon 2015-03-18 16:55:57 +01:00
commy2
330fc5658f fake weapon had mass > 0, fix #205 2015-03-18 16:47:04 +01:00
commy2
89709e835d Merge pull request #197 from KoffeinFlummi/drag 
add PBO to drag objects
 2015-03-18 16:04:12 +01:00
commy2
be17e25487 handle dc is the same fnc as handle killed 2015-03-18 16:02:01 +01:00
commy2
0bc7811912 don't drag or carry dead objects 2015-03-18 15:52:34 +01:00
commy2
4ea6b91e47 use eventhandlers instead of PFH 2015-03-18 15:42:33 +01:00
commy2
ec6496ed2f fix authors, add weight checks 2015-03-18 14:14:16 +01:00
commy2
c23c0788f6 tweaks, carry static weapons 2015-03-18 13:36:22 +01:00
commy2
ac8ff45d44 lock / unlock events 2015-03-18 11:29:58 +01:00
commy2
ab39608e4d change height when carrying, fix most cases of floating objects 2015-03-18 01:36:56 +01:00
PabstMirror
9f25641f54 Verify Mag counts, headers, check animation 2015-03-17 14:43:50 -05:00
PabstMirror
7058e48f15 Merge branch 'master' into disarmingTest 2015-03-17 12:25:59 -05:00
commy2
dc7cfab06f change default carry position 2015-03-17 15:45:34 +01:00
commy2
75548e21d9 add carry objects 2015-03-17 15:42:25 +01:00
commy2
57becc203c handle disconnection when dragging 2015-03-17 13:47:07 +01:00
commy2
5f39cf213b some fixes for MP 2015-03-17 12:20:46 +01:00
commy2
6d868d1bd1 fix collisions when releasing, fix crate fliping in buildings 2015-03-17 11:44:41 +01:00
KoffeinFlummi
b470276f7f Close dialogs when falling unconscious. 2015-03-17 08:03:11 +01:00
KoffeinFlummi
8a3e3d4b52 Remove superfluous todo 2015-03-17 08:02:55 +01:00
KoffeinFlummi
056625f0fe Check leg/arm damage in setHitPointDamage as well. 2015-03-17 07:53:50 +01:00
KoffeinFlummi
17fd051c79 Rename Bloodbag action to BloodIV 2015-03-17 07:53:35 +01:00
Nicolás Badano
3030b78ea2 Refactor the interact_menu so options for multiple objects can coexist inside a single action point 2015-03-17 00:37:28 -03:00
Nicolás Badano
eb4ccd9505 Merge branch 'hearingCleanup' of github.com:KoffeinFlummi/ACE3 
Conflicts:
	addons/hearing/functions/fnc_updateVolume.sqf
 2015-03-16 20:39:49 -03:00
Nicolás Badano
5b91996c69 Add hearing module and additional customization parameters: 
- Enable/Disable combat deafness altogether (default on)
- Volume when using earbuds (default 50%)
- Volume when unconscious (default 40%)
 2015-03-16 20:28:37 -03:00
Nicolás Badano
4c1f7111b5 Add map module 2015-03-16 20:24:53 -03:00
commy2
fef150cff2 attempt to fix collisions 2015-03-17 00:24:25 +01:00
Nicolás Badano
f90f1cfc21 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-16 18:39:20 -03:00
Nicolás Badano
cf45de7c11 Typo on altimeter. Fix #204 2015-03-16 18:36:09 -03:00
commy2
2aaef08c1d can drag / drop functions, localization 2015-03-16 20:39:49 +01:00
commy2
2da0eee1e2 add drop dragged object action 2015-03-16 20:09:54 +01:00
commy2
27404fed1b function to drop object, fix position event 2015-03-16 19:25:29 +01:00
PabstMirror
d06760e77e Use ACRE API: acre_api_fnc_setGlobalVolume 2015-03-16 13:14:45 -05:00
PabstMirror
5d0f0c2896 Rename ACE_EarBuds -> ACE_EarPlugs 
Can't verify translations
 2015-03-16 10:56:05 -05:00
commy2
ad181de578 main me 
nu for reammo_box
 2015-03-16 15:41:55 +01:00
commy2
efb3657da3 drag boxes 2015-03-16 14:31:16 +01:00
PabstMirror
ec0e2d72c2 Check firer's silencer instead of player's 2015-03-15 16:47:50 -05:00
PabstMirror
04412e8ba4 Replace spawn with waitAndExec 2015-03-15 16:46:06 -05:00
PabstMirror
1cdc341320 Headers, Formatting 2015-03-15 16:40:47 -05:00
commy2
1117942c7a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into drag 2015-03-15 19:32:07 +01:00
PabstMirror
d4624982f6 Update readme.md 2015-03-15 13:13:13 -05:00
PabstMirror
f101d40450 Readme cleanup 2015-03-15 13:10:06 -05:00
PabstMirror
726bf8d407 Headers, Formating, Fixes, Lock Inventory Option 2015-03-15 11:27:21 -05:00
commy2
898476fc2f no target in self actions 2015-03-15 16:45:06 +01:00
commy2
2744f46bd2 spelling 2015-03-15 16:12:37 +01:00
commy2
b5f307919e replace canInteract with canInteractWith 2015-03-15 13:00:10 +01:00
commy2
0064f5739c manual merge 2015-03-15 09:30:26 +01:00
commy2
4dab0b73d5 add conditions on post init 2015-03-15 09:26:16 +01:00
commy2
876424695e solve canInteract conflicts, fix #198 2015-03-15 09:02:11 +01:00
PabstMirror
5a2d7d59b6 Maptools - Use MACRO_ADDITEM from Main 2015-03-14 21:38:16 -05:00
KoffeinFlummi
99899d6562 Move advanced bloodloss handling to advanced 2015-03-15 03:26:10 +01:00
KoffeinFlummi
4cc1b08196 Add basic bleeding 2015-03-15 03:26:00 +01:00
KoffeinFlummi
d640367ff2 Add isInMedicalVehicle function 2015-03-15 03:25:31 +01:00
KoffeinFlummi
77ae997993 Don't handle unit vitals when game is paused 2015-03-15 01:48:50 +01:00
KoffeinFlummi
7f19ab7750 Only run JIP updates for wounds in advanced 2015-03-15 01:46:23 +01:00
Glowbal
62460e8b79 Fixes for animations and script error 2015-03-15 01:12:02 +01:00
Glowbal
4f08d0d006 Merge branch 'master' into SettingsMenuImprovements 
Conflicts:
	addons/optionsmenu/functions/fnc_onListBoxSettingsChanged.sqf
	addons/optionsmenu/functions/fnc_onListBoxShowSelectionChanged.sqf
	addons/optionsmenu/functions/fnc_onSettingsMenuOpen.sqf
	addons/optionsmenu/functions/fnc_onSliderPosChanged.sqf
	addons/optionsmenu/functions/fnc_resetSettings.sqf
	addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf
	addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
	addons/optionsmenu/functions/fnc_updateSetting.sqf
	addons/optionsmenu/gui/settingsMenu.hpp
 2015-03-15 00:46:14 +01:00
Nicolás Badano
5264819fd4 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 
Conflicts:
	addons/map/CfgVehicles.hpp
 2015-03-14 17:22:25 -03:00
Nicolás Badano
096b270b83 Merge branch 'mapContours' into mapfx 
Conflicts:
	addons/map/config.cpp
 2015-03-14 17:20:25 -03:00
Nicolás Badano
618c021f7e Tab to space plus comments for the spawns 2015-03-14 17:15:28 -03:00
Nicolás Badano
518010be36 Reordered the map, mapfx and pbos: 
- mapfx moved inside map
- everything related to map tools and drawing moved to it's own pbo called ace_maptools

Also fixed a couple of bugs in BFT
- Only a single marker was being drawn
- The BFT_HideAi parameter had the opposite effect
 2015-03-14 16:58:05 -03:00
PabstMirror
bab1984782 Merge pull request #194 from KoffeinFlummi/captivesMedicalInegration 
Captives medical inegration
 2015-03-14 13:11:31 -05:00
PabstMirror
ebbebea6f2 Merge pull request #187 from KoffeinFlummi/wirecuttersInerationTest 
Wirecutters Interaction
 2015-03-14 13:11:17 -05:00
PabstMirror
da337fff3e Merge pull request #184 from KoffeinFlummi/InventoryResize 
Dynamic Inventory Resize
 2015-03-14 13:10:56 -05:00
PabstMirror
a92389f450 optMenu - remove 'fix anim' button and add headers 2015-03-14 13:10:25 -05:00
commy2
b79978116d some functions 2015-03-14 18:38:44 +01:00
Nicolás Badano
c03115b564 Refactored mapfx code, make the three features optional 2015-03-14 13:46:10 -03:00
commy2
f3f20439c8 config stuff, functions to make objects dragable 2015-03-14 13:51:23 +01:00
commy2
58212f5ce0 add PBO to drag objects 2015-03-14 12:05:43 +01:00
Glowbal
2bee533a8c Added AGM stringtables for drag, carry, load & unload 2015-03-14 09:51:08 +01:00
Glowbal
dcf3a73518 Added copyDeadBody function 2015-03-14 09:48:16 +01:00
Glowbal
99b1986059 Added setting for allowing movement of dead bodies 2015-03-14 09:37:19 +01:00
Nicolás Badano
69fa51cfeb Calculate map illumination based on ambientBrightness 2015-03-13 22:27:38 -03:00
Nicolás Badano
80e7117ead Tweak ambientBrightness to take into acount the cloud coverage 2015-03-13 22:27:14 -03:00
Nicolás Badano
7e2e6999bd Ported from ACE2: 
- Bring scale legend to ingame map
- Tweak map colors to make them exactly the same as ACE2 (had to import road colors directly from Arma 2, cause ACE just used defaults).
- Hide bushes and trees from the ingame map (they remain visible on the editor)
- Keep sattelite texture toogable, but with a opacity of 50%.
 2015-03-13 19:34:56 -03:00
commy2
db6e0fe99b hpps for realistic names 2015-03-13 19:10:24 +01:00
commy2
25fc24a419 fix cfgPatches in laserpointer 2015-03-13 18:52:30 +01:00
Glowbal
5390c3668e Added icon microDAGR 2015-03-13 18:43:21 +01:00
commy2
1e731ee425 fix vector cfg patches 2015-03-13 18:34:13 +01:00
PabstMirror
93262f3b92 Use ace_isUnconscious in anim changed EH 2015-03-13 00:45:12 -05:00
Nicolás Badano
86c16953ea Refactor and tweak map illumination to: 
- add tint depending on time of day.
- make it slightly less dark at night, so it's usable under any condition.
Temporarily remove light creation.
 2015-03-13 01:35:45 -03:00
Nicolás Badano
a4ea5fb724 Cache the call to determineMapLight 2015-03-13 01:01:00 -03:00
PabstMirror
55fcc60453 Merge branch 'master' into captivesMedicalInegration 2015-03-12 22:44:24 -05:00
Nicolás Badano
8d0cc787b0 Initial port/reimplementation of ace_mapfx, providing: 
- dynamic map illumination
- shacking maps when on the move
- optional max zoom
 2015-03-12 21:04:10 -03:00
Glowbal
4ce524ed3c First draft of carry and drop unit 2015-03-12 21:16:49 +01:00
PabstMirror
c1c3325368 Fix missing display error. 2015-03-12 13:02:04 -05:00
PabstMirror
da87425df3 Vector intergration (Hold Tab+R) 2015-03-12 12:57:44 -05:00
PabstMirror
58029101b8 readme 2015-03-12 12:41:04 -05:00
PabstMirror
f33da5928c Icon Size 2015-03-12 12:31:21 -05:00
PabstMirror
5197a5c453 Date display to info screen 2015-03-12 12:28:52 -05:00
PabstMirror
ec6d2c44bc Fix mappos not saving 2015-03-12 12:16:33 -05:00
PabstMirror
777e088484 Ambient light levels for background fading 2015-03-12 12:09:35 -05:00
PabstMirror
862a758e3b Merge branch 'master' into microDAGR 2015-03-12 11:39:12 -05:00
KoffeinFlummi
82f73117f4 Merge branch 'master' into medical-basic 2015-03-12 07:35:57 +01:00
KoffeinFlummi
a3069e3356 Fix wrong pain variable in patient information 2015-03-12 07:35:29 +01:00
KoffeinFlummi
ef491a7c76 Add basic information to dialog 2015-03-12 07:34:29 +01:00
KoffeinFlummi
809f6754cc Add pain & painkiller reduction over time 2015-03-12 07:33:44 +01:00
PabstMirror
3febb1e770 WindDef - Convert to use FiredBIS 2015-03-12 00:28:33 -05:00
PabstMirror
86441ce6c5 WindDef - Enable Eventhandler 2015-03-12 00:18:18 -05:00
PabstMirror
f64abcd583 Respawn - Module icon filenames 2015-03-12 00:12:19 -05:00
PabstMirror
aaeb5a3392 Parachute - Move unused p3d back to TOMERGE 2015-03-12 00:07:28 -05:00
PabstMirror
82ea87d1de Parachute - Config Division/Formating 2015-03-12 00:05:28 -05:00
PabstMirror
dd026cea0f Medical - add tourniquet p3d and other missing tex 
Ported tourniquet from cse
add missing textures for other items
fix paths in rvmats
 2015-03-11 23:52:58 -05:00
PabstMirror
bed312dcee Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
Nicolás Badano
d02b5d2125 Ensure the class actions are compiled from config before adding them from the API 2015-03-11 16:26:58 -03:00
PabstMirror
5ab9ad87f9 QGVAR typo 2015-03-11 13:33:45 -05:00
PabstMirror
3a7c7f7cee Fix interactMenuClosed event 2015-03-11 12:48:17 -05:00
PabstMirror
858e5def5a Interact menu event consistant 
"interactMenuOpened",  to match event from #191
 2015-03-11 12:45:01 -05:00
KoffeinFlummi
fabecdd0d3 Merge branch 'master' into medical-basic 2015-03-11 18:20:16 +01:00
KoffeinFlummi
a641a5db8b Make use of fnc_setUnconscious 2015-03-11 18:08:29 +01:00
KoffeinFlummi
8d22b61a2d Assign structural damage to torso 2015-03-11 18:08:00 +01:00
PabstMirror
95d59a1b3a Headers 2015-03-11 02:06:07 -05:00
Nicolás Badano
8c7a51eac7 Added addClassAction and removeClassAction functions 2015-03-11 01:43:37 -03:00
Nicolás Badano
3dfef439e5 Delay the interactMenuClosed event until after the statement is executed, just in case it's needed to clean up afterwards. 2015-03-11 00:49:46 -03:00
Nicolás Badano
28929df32d Avoid submenus running statements when they open. Instead just check if the hovering action should runOnHover 2015-03-11 00:39:23 -03:00
Nicolás Badano
c573b1048d Made medical diagnosis statements run on hover 2015-03-11 00:38:31 -03:00
Nicolás Badano
f12e4ab751 Add the runOnHover parameter 2015-03-11 00:37:59 -03:00
Nicolás Badano
7138fadd71 Support additional parameters for addAction API 2015-03-11 00:25:45 -03:00
Nicolás Badano
722f49acc4 Execute statement when hovering over actions that open submenus 2015-03-11 00:21:05 -03:00
PabstMirror
d6e7775cac Can Show: Hide when gun up 2015-03-10 22:11:25 -05:00
PabstMirror
13e6ae60b2 Settings Menu, Mils, Localization 2015-03-10 21:48:57 -05:00
Nicolás Badano
b33127d3b0 Renamed variable 2015-03-10 23:45:46 -03:00
Nicolás Badano
e97467b3e3 Throw an event when the interact menu is closed 2015-03-10 23:36:28 -03:00
Nicolás Badano
14b97de930 Cache the generation of active action trees for action points. This sensibly cuts down the execution of action conditions. 2015-03-10 23:23:13 -03:00
Nicolás Badano
fab81c8701 Added helper function to cache generic function calls for a given time 2015-03-10 23:20:05 -03:00
commy2
cad5456010 function to check if an object is alive 2015-03-10 23:35:05 +01:00
PabstMirror
794a1f9922 Wirecutter handles interact event 
adds helper objects to all fences that have actions
 2015-03-10 16:01:46 -05:00
PabstMirror
49cef030d5 Add "interact_keyDown" local event to interactMenu 2015-03-10 15:48:08 -05:00
Glowbal
1da67d7b48 First draft of triage card 2015-03-10 21:12:35 +01:00
jaynus
59db61e192 Performance counter macros 2015-03-10 12:59:40 -07:00
Glowbal
45dbb0524c Merge pull request #181 from KoffeinFlummi/Additional_UI_Client_settings 
Additional ui client settings #177
 2015-03-10 19:55:44 +01:00
Glowbal
a4d73e1b01 DEFUNC -> DFUNC 2015-03-10 19:51:51 +01:00
PabstMirror
1dd270812d Finish keybind conversion for old interact 2015-03-10 12:47:58 -05:00
PabstMirror
7173037cb0 Fix 2 broken keybinds 2015-03-10 12:45:08 -05:00
commy2
b2e8ca5dbc zipper sounds for opening backpacks 2015-03-10 17:48:24 +01:00
commy2
025c45dccc remove lockbackpacks code, add sound and camshake, ref #178 2015-03-10 17:18:21 +01:00
PabstMirror
3f32627d61 Implement Unconc Event Handler 2015-03-10 11:08:15 -05:00
PabstMirror
93a1cdaab6 setCaptivityStatus in setUnconsicous 2015-03-10 10:35:00 -05:00
commy2
eeb07f2bf6 rename lockbackpacks to backpacks 2015-03-10 15:58:29 +01:00
PabstMirror
6ac83b7702 Cleanup 2015-03-09 18:53:19 -05:00
PabstMirror
35f72e0fda Dynamic Inventory Size 2015-03-09 18:46:51 -05:00
Glowbal
e741c8a12b Config stuff 2015-03-09 22:36:25 +01:00
PabstMirror
1cf8843cae Show Waypoints on map 2015-03-09 16:28:29 -05:00
Glowbal
4b171f9507 Indentation 2015-03-09 22:27:01 +01:00
Glowbal
6b91cefb90 Minor fixes and added pain status 2015-03-09 22:23:37 +01:00
PabstMirror
ce5595e107 BIS_fnc_gridToPos 2015-03-09 16:09:00 -05:00
Glowbal
8cc0361cb4 localization and displayText fixes 2015-03-09 22:08:43 +01:00
Glowbal
8a3eac2aa0 Added medical actions to sub menu 
Added statements
 2015-03-09 22:08:32 +01:00
Glowbal
f62335f71c Fixed custom conditions 2015-03-09 21:42:09 +01:00
Glowbal
5afc651519 fixed incorrect tourniquet classname 2015-03-09 21:41:58 +01:00
Glowbal
6aae11944b config fixes 2015-03-09 21:41:43 +01:00
Glowbal
a37afec70e fixed inheritance of treatment classes 2015-03-09 21:14:39 +01:00
Glowbal
9b856ea38b Merge branch 'master' into Medical_Improvements 2015-03-09 21:08:18 +01:00
Glowbal
f7159084c3 Made the menu slightly wider 2015-03-09 21:05:11 +01:00
Glowbal
aeb4c91792 Added interaction menu actions for advanced medical 2015-03-09 21:05:01 +01:00
Glowbal
f6fbef980a Added support for bandaging a specific injury class on a selection 2015-03-09 20:03:17 +01:00
PabstMirror
0fd49d179d doh 2015-03-09 13:55:07 -05:00
PabstMirror
29bd613445 canShow base 2015-03-09 13:53:49 -05:00
PabstMirror
1d6cfbf6b7 Various Changes 2015-03-09 13:52:15 -05:00
Garth L-H de Wet
ece4c8e0bc Merge branch 'master' into explosiveInteraction 2015-03-09 20:07:42 +02:00
Glowbal
c7ede12b99 Removed weapon select, is now just grenade throw 2015-03-09 19:03:55 +01:00
PabstMirror
f387da1475 Working Base MicroDAGR 2015-03-09 10:46:59 -05:00
commy2
107fec4245 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-03-08 19:52:12 +01:00