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,512 Commits 73 Branches 88 Tags 752 MiB
70ffefde10
Commit Graph

1512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
cb63302926 Merge pull request #193 from KoffeinFlummi/Medical_Dragging 
Medical: Carry, drag and dropping of a unit
 2015-03-22 23:30:32 +01: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
079910d54d Merge pull request #221 from KoffeinFlummi/medical-advanced 
Medical: Self interaction
 2015-03-22 22:38:39 +01:00
Glowbal
9e43ab5c25 Merge branch 'master' into medical-advanced 2015-03-22 22:37:37 +01:00
Glowbal
0233b923f5 Merge pull request #220 from KoffeinFlummi/medical-jip-fixes 
Medical jip fixes
 2015-03-22 22:36:26 +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
479e84d4d0 Merge pull request #219 from KoffeinFlummi/reloadLaunchers 
Reload launchers
 2015-03-22 14:50:09 +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