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
1,722 Commits 73 Branches 88 Tags 752 MiB
a5ff34e1d8
Commit Graph

1588 Commits

Author SHA1 Message Date
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
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
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
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
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
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