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,724 Commits 73 Branches 88 Tags 752 MiB
a658cafb4e
Commit Graph

1724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bux578
fed840a4f9 Update README.md 2015-03-19 13:09:56 +01: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
785d415189 Merge pull request #152 from KoffeinFlummi/fixesForFCS 
Fixes for fcs
 2015-03-18 17:58:34 +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