Commit Graph

38 Commits

Author SHA1 Message Date
PabstMirror
2ced42ae3a Cleanup markers 2018-01-06 00:52:57 -06:00
commy2
3c41d37417 overhaul movable markers (#5922)
* overhaul movable markers

* moving markers setting

* disable debug

* fix conflict with map gestures
2018-01-05 18:55:00 +01:00
commy2
4319b79b45 use ownerEvent instead of game logics 2017-12-11 20:11:21 +01:00
Christian Klemm
22b4788891 added movable markers option (#5397)
* added movable markers option

* added restrictions

* added local events

* formatting + small fixes

* Events for start and end modified + small adjusts

* minor fixes

* lazy eval

* Alt as modifier key

* Update XEH_postInit.sqf

* Skip UI EH on headless
2017-09-07 19:26:32 +02:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255)
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
2017-06-08 15:31:51 +02:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
PabstMirror
b6aaba7f90 Integrate 1.60 marker shape color map interface (#3860)
1.60 adds ability to set color and marker type from the map interface
Luckily they use the same values and indexes as ACE,
This PR connects the two systems,
Selecting a color from the 1.60 map display will set the color in the
ace marker display and vice versa
2016-06-02 09:28:52 -05:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
esteldunedain
849fa4f1ee Redo markers, lost in the merge 2016-02-27 09:06:19 -03:00
esteldunedain
b2c672e6c7 Apply the same pattern to ACE_Markers 2016-02-23 19:32:39 -03:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
commy2
7748131e73 code cleanup markers 2015-12-10 15:32:31 +01:00
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
a8228f60c2 fix configFile capitalization 2015-11-30 17:23:02 +01:00
commy2
dcf0a68b80 Revert "fix Cfg capitalization"
This reverts commit 43bda9c462.
2015-11-30 17:00:32 +01:00
commy2
43bda9c462 fix Cfg capitalization 2015-11-30 16:52:20 +01:00
PabstMirror
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
PabstMirror
a82e5b5436 Fix Colors + Debug Trace 2015-08-23 14:25:41 -05:00
jokoho48
f35b82ddb9 Code Cleanup Marker Module. 2015-08-22 14:08:35 +02:00
jonpas
1eeca28a3d Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting 2015-06-13 22:08:13 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
PabstMirror
00f26144ec More Privates 2015-04-17 15:45:00 -05:00
PabstMirror
a4af1fcb30 Fix Marker Placement on UAV Map 2015-04-08 13:55:29 -05:00
PabstMirror
4e4834974a cleanup debug 2015-03-27 23:26:41 -05:00
PabstMirror
aa5a580645 Cleanup 2015-03-27 23:24:11 -05:00
PabstMirror
909f53753a Fix JIP Marker SYnc 2015-03-27 23:19:03 -05:00
PabstMirror
e5cbca02e4 Show placement angle in preview 2015-03-27 22:55:19 -05:00
PabstMirror
24bba5dea6 Headers 2015-03-27 20:51:30 -05:00
PabstMirror
63b7f0a755 Marker Fixes for 1.42 WIP 2015-03-27 19:22:49 -05:00
PabstMirror
8945f99be1 Fix CurrentChannel
GVAR -> FUNC
onEachFrame exits when channel control is closed
2015-02-21 21:19:54 -06:00
PabstMirror
cb52ac18c9 Send marker configNames instead of index
Upstream fix from AGM
If CfgMarkers don't match, will throw warning:
22:46:53
[3896,74.535,0,"z\ace\addons\markers\functions\fnc_setMarkerNetwork.sqf:11","WARNING:
CfgMarker not found changed to milDot"]
2015-01-19 22:49:39 -06:00
commy2
e55a85cc26 get markers to work 2015-01-19 16:59:00 +01:00
commy2
a545efe02c work on port markers 2015-01-18 17:17:06 +01:00
commy2
cb8945a879 port markers 2015-01-18 08:20:55 +01:00