Commit Graph

1138 Commits

Author SHA1 Message Date
Glowbal
308e165cb6 Fixed headers 2015-02-21 21:25:37 +01:00
Nicolás Badano
6b7f649244 interact_menu: add headers 2015-02-21 17:11:03 -03:00
Glowbal
ead5f2ee79 Added new injury and treatment systems for advanced medical 2015-02-21 21:10:57 +01:00
Glowbal
b3e7431e67 Added new treatment framework 2015-02-21 21:09:57 +01:00
KoffeinFlummi
3482633fb1 Basic treatment structure 2015-02-20 22:04:01 +01:00
Nicolás Badano
96abddc31b Ability to link a belt of ammo to an AR's machinegun while he's firing. Non stop suppresion! 2015-02-20 02:45:17 -03:00
Nicolás Badano
2c05db3ffb Create an interaction point for the current weapon 2015-02-20 02:04:00 -03:00
Nicolás Badano
908f23a78f Removed filtering actions 2015-02-19 20:10:07 -03:00
PabstMirror
3511a74ef9 Don't show sound if not enabled 2015-02-19 16:59:21 -06:00
Nicolás Badano
dd92c5e845 Tap on either shoulder. "Tap" animation 2015-02-19 19:45:46 -03:00
PabstMirror
3ade628d87 Handle 3 Soundwave options 2015-02-19 16:42:28 -06:00
Nicolás Badano
bc3a226c64 Text under the icon 2015-02-19 18:56:43 -03:00
Nicolás Badano
41145e5731 reduce size of the menu 2015-02-19 18:03:25 -03:00
Nicolás Badano
0dfeb22ec8 tidy up 2015-02-19 18:03:14 -03:00
Glowbal
b58abaa2c0 Added a transparant background 2015-02-19 22:01:09 +01:00
Glowbal
ab6879845c Merge branch 'master' into standardize_ui 2015-02-19 21:42:47 +01:00
Glowbal
a81c1fbef5 Overhauled AGM hint. 2015-02-19 21:38:51 +01:00
PabstMirror
a8e269bc18 Cleanup Escort Logic
No more ERROR spam
2015-02-19 14:34:14 -06:00
Glowbal
2cf0ceff2a Merge pull request #147 from KoffeinFlummi/common_cleanup
Clean up of CSE code
2015-02-19 21:33:57 +01:00
PabstMirror
ae61dff44e Move draw to function (wip) 2015-02-19 14:29:38 -06:00
Garth "L-H" de Wet
455d682706 Merge pull request #128 from KoffeinFlummi/IEDSupport
IED support
2015-02-19 21:44:00 +02:00
Nicolás Badano
861a6b1775 avoid all submenus opening simultaneously by switching menu paths to use uids 2015-02-19 15:47:59 -03:00
Nicolás Badano
f7d5d615ee allow actions to be defined for different selections 2015-02-19 15:36:27 -03:00
Glowbal
21199a4ee6 Now uses BIS_fnc_rscLayer 2015-02-19 19:32:49 +01:00
Glowbal
c8d4acfc81 Refactored displayText to no longer use spawn. 2015-02-19 19:29:54 +01:00
Glowbal
b0373de576 Tabs to spaces 2015-02-19 19:14:52 +01:00
Glowbal
612fa69c1c Renamed string_removeWhiteSpace to stringRemoveWhiteSpace. 2015-02-19 19:12:14 +01:00
Glowbal
8488f10b92 Merge pull request #149 from KoffeinFlummi/cseMissionModules
Port: CSE Ambiance sound module
2015-02-19 19:07:38 +01:00
Glowbal
af3709f481 Fixed forgotten missionModules. 2015-02-19 19:07:19 +01:00
Glowbal
1ea35548e0 Fixed ambiance sounds module. 2015-02-19 18:40:40 +01:00
Nicolás Badano
30943cbfd4 move the main menu actions to the right cuadrant 2015-02-19 12:03:20 -03:00
Nicolás Badano
a8797fe45a Fix for the angular spacing of submenus 2015-02-19 12:02:48 -03:00
Nicolás Badano
db5e8bcc34 Modify the opacity of icons along with that of the text 2015-02-19 12:01:47 -03:00
Garth L-H de Wet
96404bc42a Fixed isNull check not working. Fixed audio not being found. 2015-02-19 15:59:14 +02:00
Nicolás Badano
d055315661 interact_menu: tab to space 2015-02-19 10:49:36 -03:00
Nicolás Badano
53f632c716 Merge branch 'selfInteractionMenu' of github.com:KoffeinFlummi/ACE3 into selfInteractionMenu 2015-02-19 10:39:28 -03:00
Nicolás Badano
3b35d9d109 Make interact sub menus open as circle sectors instead of full circles 2015-02-19 10:38:09 -03:00
Nicolás Badano
8e6600d5ec Tweak distances 2015-02-19 10:36:59 -03:00
Garth L-H de Wet
f5a6f6f404 Fixed various points raised in the PR. 2015-02-19 15:30:01 +02:00
Garth L-H de Wet
89a81dbed1 Forgotten function added. 2015-02-19 12:40:21 +02:00
Garth L-H de Wet
00643c3c83 Ensured actual fuse time is used instead of simply 1. 2015-02-19 12:39:13 +02:00
Garth L-H de Wet
8c83320675 Separated dialing phone code into separate function to neaten up the original function. 2015-02-19 12:32:41 +02:00
Garth L-H de Wet
e592f233f3 Merge branch 'master' into IEDSupport 2015-02-19 12:26:38 +02:00
PabstMirror
244d7a5572 Fix opacity fading on other render levels 2015-02-19 03:02:58 -06:00
Nicolás Badano
043987fc93 basic self actions 2015-02-18 18:58:06 -03:00
Felix Wiegand
0d3f9c5345 Merge pull request #153 from KoffeinFlummi/editorconfig
Add editorconfig
2015-02-18 19:57:54 +01:00
KoffeinFlummi
7e9a02089f Merge branch 'medical-visuals' into medical-rewrite
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
2015-02-18 19:26:30 +01:00
KoffeinFlummi
3aae72aa70 Cleanup 2015-02-18 19:22:35 +01:00
KoffeinFlummi
58873e1c97 Pain Effect 2015-02-18 19:01:25 +01:00
KoffeinFlummi
18b083d2aa Build DLL with changes from 075d1d6 2015-02-18 17:03:44 +01:00