Garth L-H de Wet
3ff1bff2bf
Merge branch 'master' into explosiveInteraction
2015-03-01 14:31:06 +02:00
Nicolás Badano
e44e13d1b8
Merge pull request #162 from KoffeinFlummi/interactionOptimization
...
Interaction Menu plumbing
2015-02-28 17:33:53 -03:00
PabstMirror
dfdee62732
Movement Comments/Formating
2015-02-28 09:26:35 -06:00
PabstMirror
901a06587d
Merge pull request #144 from KoffeinFlummi/cseSoundWaves
...
CSE sound waves
2015-02-27 15:32:16 -06:00
PabstMirror
bf21a8bc91
Pull configSetting from upstream
2015-02-27 15:28:48 -06:00
Nicolás Badano
2371bc1bb0
Removed the renderDepth variables
2015-02-27 02:35:37 -03:00
Nicolás Badano
08b15315bf
Fixed removeAction; added trekkie examples
2015-02-27 02:20:28 -03:00
Nicolás Badano
3d8854f84a
Fixed opacity of icons; removed debug traces
2015-02-27 02:07:35 -03:00
Nicolás Badano
310710b6e2
Major plumbing upgrades on interact_menu:
...
- Store only one compiled menu per class
- Actions added through apis for invidual objects stored on the object separately
- Replaced the concept of uids by paths. This allows adding/removing actions inside other actions loaded from config seamlessly.
- Temporarily removed caching of nearby actions (probe). We may go back to that if needed pretty easily. This allows the player to move freely with the interaction menu opened.
2015-02-27 01:55:16 -03:00
Garth L-H de Wet
fcb7e8b1bd
Merge branch 'master' into explosiveInteraction
2015-02-26 22:30:04 +02:00
PabstMirror
7e2283115c
Merge pull request #155 from KoffeinFlummi/fixSurrendering
...
Fix surrendering/handcuffs
2015-02-26 14:22:48 -06:00
Glowbal
5b50910ef6
Fixed incorrect size
2015-02-25 11:23:35 +01:00
Glowbal
5883c673e4
Merge branch 'displayTextRemoteClients' of github.com:KoffeinFlummi/ACE3 into displayTextRemoteClients
2015-02-24 20:25:43 +01:00
Glowbal
e10c907454
Added missing header arguments
2015-02-24 20:25:34 +01:00
PabstMirror
80ac6d83de
Zeus Module Messages
2015-02-24 12:44:54 -06:00
PabstMirror
97d1889971
Shift Display to Right if Zeus Interface is open
2015-02-24 12:40:22 -06:00
PabstMirror
ae3de331c4
Module At Mission Start (Issue #148 )
2015-02-24 11:51:37 -06:00
PabstMirror
233647a144
Merge branch 'master' into fixSurrendering
2015-02-24 11:37:28 -06:00
PabstMirror
5364980997
Zeus Module Hints
2015-02-24 11:36:49 -06:00
Glowbal
37031b5002
Replaced execRemoteFnc by ACE event system
2015-02-24 18:10:40 +01:00
Glowbal
278f0ab889
Fixed indentation
...
Added check for AI units
2015-02-24 18:02:41 +01:00
PabstMirror
85c568a061
Comments
2015-02-24 10:27:53 -06:00
Glowbal
6fde2de40f
Improved localization support and sendDisplayText to remote client objects.
2015-02-24 17:14:19 +01:00
Garth L-H de Wet
a13fe3e9ce
Merge branch 'master' into explosiveInteraction
2015-02-24 00:14:09 +02:00
Nicolás Badano
669568cafe
Merge pull request #157 from KoffeinFlummi/selfInteractionMenu
...
Self action menu and Action menu on selections
2015-02-23 14:24:43 -03:00
Glowbal
40d98b04a4
Merge pull request #145 from KoffeinFlummi/standardize_ui
...
Standardize UI
2015-02-23 18:11:11 +01:00
Glowbal
82c181cd7c
Fixed header
2015-02-22 14:54:54 +01:00
Glowbal
5e0eb7323a
Added option to toggle between progressbar top and bottom
2015-02-22 14:38:48 +01:00
Glowbal
77666e8097
Added weapon resting state icon
2015-02-22 13:58:51 +01:00
Glowbal
dd51037c5e
Added support for image color
2015-02-22 13:44:17 +01:00
Glowbal
9d44ec18b8
Added a default text color setting
2015-02-22 13:35:05 +01:00
Glowbal
323d673eec
Removed deprecated config entries (DisplayMessage and DisplayInformation)
2015-02-22 13:20:17 +01:00
Glowbal
14411a5ef0
Fixed weird fix for getNumber for Array bug in setSettingFromConfig.
2015-02-22 11:36:21 +01:00
Glowbal
1ed50bfe3e
Fixed font size
2015-02-22 11:35:52 +01:00
Glowbal
47e27d7be3
Merge branch 'standardize_ui' of github.com:KoffeinFlummi/ACE3 into standardize_ui
2015-02-22 11:19:46 +01:00
Glowbal
8393645df9
Changed position to be inline with the weapon selector UI element by default
2015-02-22 11:19:32 +01:00
Glowbal
a574487166
Added localization support for displayText
2015-02-22 11:19:10 +01:00
Glowbal
9f3a0fe8d4
Removed displayInfo and displayMessage functions.
2015-02-22 11:18:37 +01:00
PabstMirror
8945f99be1
Fix CurrentChannel
...
GVAR -> FUNC
onEachFrame exits when channel control is closed
2015-02-21 21:19:54 -06:00
PabstMirror
11be8f6f8f
Merge pull request #156 from KoffeinFlummi/nightVisionCleanup
...
Night vision cleanup
2015-02-21 20:21:04 -06:00
Nicolás Badano
6b7f649244
interact_menu: add headers
2015-02-21 17:11:03 -03:00
Garth L-H de Wet
2ad0aab2bb
Merge branch 'master' into explosiveInteraction
2015-02-21 13:17:08 +02:00
Garth L-H de Wet
9d1b1e1b12
Explosives are now placed first and then the trigger is set afterwards.
2015-02-20 03:28:16 +02: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
Garth L-H de Wet
477d8c9dec
Merge remote-tracking branch 'origin/selfInteractionMenu' into explosiveInteraction
2015-02-20 00:46:56 +02:00
Nicolás Badano
dd92c5e845
Tap on either shoulder. "Tap" animation
2015-02-19 19:45:46 -03:00
Garth L-H de Wet
88af894f55
Added a SetTrigger action to placement items in preparation for changes over to a set trigger after place system as opposed to before.
2015-02-20 00:45:31 +02:00
Garth L-H de Wet
910a6a16ab
Split out the EPEContactStart code into its own function since it was quite long.
2015-02-20 00:44:54 +02:00
PabstMirror
3ade628d87
Handle 3 Soundwave options
2015-02-19 16:42:28 -06:00
