rc

OCAP2 · Jul 31, 2021 · 26cab13 · 26cab13
1 parent 8048131
commit 26cab13
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Fixes
 
 #### Addon
+- [[addon/#25]](https://github.com/OCAP2/addon/pull/25) Fixes incorrect color for "ColorUNKNOWN" in playback
 - [[OCAP/#32]](https://github.com/OCAP2/OCAP/issues/32) Adds submunition ammo type handling for projectile tracking
 - [[OCAP/#33]](https://github.com/OCAP2/OCAP/issues/33) Marker creation time was displayed ~2sec later during playback
 - [[OCAP/#36]](https://github.com/OCAP2/OCAP/issues/36) Grenades, any other thrown object and fire lines were not shown after unit respawn

diff --git a/addon b/addon
diff --git a/web b/web
+2 −0		.gitignore
+0 −10		addons/@ocap/OcapReplaySaver2.cfg.json
+0 −10		addons/@ocap/OcapReplaySaver2.cfg.json.sample
+26 −10		addons/@ocap/addons/ocap/config.cpp
+41 −3		addons/@ocap/addons/ocap/functions/fn_addEventHandlers.sqf
+32 −8		addons/@ocap/addons/ocap/functions/fn_addEventMission.sqf
+7 −1		addons/@ocap/addons/ocap/functions/fn_eh_disconnected.sqf
+57 −12		addons/@ocap/addons/ocap/functions/fn_eh_fired.sqf
+73 −21		addons/@ocap/addons/ocap/functions/fn_eh_hit.sqf
+47 −66		addons/@ocap/addons/ocap/functions/fn_eh_killed.sqf
+74 −0		addons/@ocap/addons/ocap/functions/fn_exportData.sqf
+31 −1		addons/@ocap/addons/ocap/functions/fn_extension.sqf
+26 −7		addons/@ocap/addons/ocap/functions/fn_getDelay.sqf
+66 −0		addons/@ocap/addons/ocap/functions/fn_getEventWeaponText.sqf
+47 −0		addons/@ocap/addons/ocap/functions/fn_getInstigator.sqf
+24 −0		addons/@ocap/addons/ocap/functions/fn_getUnitType.sqf
+53 −0		addons/@ocap/addons/ocap/functions/fn_handleCustomEvent.sqf
+163 −116		addons/@ocap/addons/ocap/functions/fn_handleMarkers.sqf
+79 −0		addons/@ocap/addons/ocap/functions/fn_init.sqf
+111 −26		addons/@ocap/addons/ocap/functions/fn_startCaptureLoop.sqf
+25 −2		addons/@ocap/addons/ocap/functions/fn_trackAceExplLife.sqf
+27 −1		addons/@ocap/addons/ocap/functions/fn_trackAceExplPlace.sqf
+1 −2		addons/@ocap/addons/ocap/functions/fn_trackAceRemoteDet.sqf
+26 −4		addons/@ocap/addons/ocap/functions/fn_trackAceThrowing.sqf
+45 −0		addons/@ocap/addons/ocap/functions/fn_updateTime.sqf
+28 −3		addons/@ocap/addons/ocap/script_macros.hpp
+10 −7		userconfig/ocap/config.hpp