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
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
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
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
