Skip to content

Commit

Permalink
addon cba rework & web frontend improvements
Browse files Browse the repository at this point in the history
- need readme and docs updates
  • Loading branch information
indig0fox committed Jul 27, 2023
1 parent e3ceddb commit fecd04c
Show file tree
Hide file tree
Showing 29 changed files with 442 additions and 8 deletions.
Empty file added .editorconfig
Empty file.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Recordings can be easily browsed and are filterable and searchable with custom t

### -- Units in Mission --

- OCAP2 tracks players, AI, and vehicles in a mission.
- OCAP tracks players, AI, and vehicles in a mission.
- Group names and roles a player was slotted as are displayed during playback.
- Players will remain in the list only while they're connected.
- Vehicles will show who is crewing them, if anyone.
Expand Down
2 changes: 1 addition & 1 deletion addon
Submodule addon updated 194 files
2 changes: 1 addition & 1 deletion extension
8 changes: 4 additions & 4 deletions tiles_tut/getMapConfig.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ _newMap = {
params ["_configName", "_displayName"];
_str = format ['
{
"name": %3,
"name": %1,
"worldName": %2,
"worldSize": -1,
"worldSize": %3,
"imageSize": 16384,
"multiplier": -1
}
',
endl,
str _displayName,
str _configName,
str _displayName
_displayName call BIS_fnc_mapSize
];
_str
};
Expand Down
Binary file added tools/naturaldocs/Data/ClassHierarchy.nd
Binary file not shown.
Binary file added tools/naturaldocs/Data/ConfigFileInfo.nd
Binary file not shown.
46 changes: 46 additions & 0 deletions tools/naturaldocs/Data/FileInfo.nd
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
1.52
SQF
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\XEH_prep.sqf 1648322205 0 C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\XEH_prep.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\script_component.hpp 1666136035 1 script_component.hpp
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_getEventWeaponText.sqf 1666208175 1 fnc_getEventWeaponText.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_handleCustomEvent.sqf 1666204940 1 fnc_handleCustomEvent.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\script_component.hpp 1666208236 1 script_component.hpp
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\script_component.hpp 1666136039 1 script_component.hpp
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_eh_firedMan.sqf 1666207666 1 fnc_eh_firedMan.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\XEH_postInit.sqf 1649798207 0 C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\XEH_postInit.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_addUnitEventHandlers.sqf 1666205034 1 fnc_addUnitEventHandlers.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_updateTime.sqf 1666208097 1 fnc_updateTime.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_aceExplosives.sqf 1666201579 1 fnc_aceExplosives.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_getUnitType.sqf 1666208179 1 fnc_getUnitType.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_eh_projectileHit.sqf 1666205244 1 fnc_eh_projectileHit.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\config.cpp 1664473474 0 C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\config.cpp
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\config.cpp 1666132720 0 C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\config.cpp
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\XEH_preInit.sqf 1666210022 1 CBA Settings
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_handleMarkers.sqf 1666208376 1 fnc_handleMarkers.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\XEH_preInit.sqf 1666210089 1 CBA Settings
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_eh_killed.sqf 1666205034 1 fnc_eh_killed.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_init.sqf 1666205034 1 fnc_init.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\XEH_postInit.sqf 1648282095 0 C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\XEH_postInit.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\XEH_postInit.sqf 1649797751 0 C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\XEH_postInit.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_exportData.sqf 1666193188 1 fnc_exportData.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_entityMonitors.sqf 1666205489 1 fnc_entityMonitors.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_eh_connected.sqf 1666203337 1 fnc_eh_connected.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_startRecording.sqf 1666208196 1 fnc_startRecording.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_isKindOfApc.sqf 1666208190 1 fnc_isKindOfApc.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\XEH_prep.sqf 1648322066 0 C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\XEH_prep.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_eh_onUserAdminStateChanged.sqf 1666204940 1 fnc_eh_onUserAdminStateChanged.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_addEventMission.sqf 1666205069 1 fnc_addEventMission.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_adminUIcontrol.sqf 1666204940 1 fnc_adminUIControl.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\config.cpp 1666208424 0 config.cpp
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_getWeaponDisplayData.sqf 1666208182 1 fnc_getWeaponDisplayData.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_stopRecording.sqf 1666208198 1 fnc_stopRecording.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\script_macros.hpp 1666208585 1 script_macros.hpp
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_captureLoop.sqf 1666202683 1 fnc_captureLoop.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_getClass.sqf 1666205814 1 fnc_getClass.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\fnc_sendData.sqf 1666208155 1 fnc_sendData.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_projectileMonitors.sqf 1666207794 1 fnc_projectileMonitors.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\XEH_prep.sqf 1665332872 0 C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\XEH_prep.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_getInstigator.sqf 1666206037 1 fnc_getInstigator.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_eh_disconnected.sqf 1666205034 1 fnc_eh_disconnected.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\XEH_preInit.sqf 1648282077 0 C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\XEH_preInit.sqf
C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_getAmmoMarkerData.sqf 1666205660 1 fnc_getAmmoMarkerData.sqf
Binary file added tools/naturaldocs/Data/ImageFileInfo.nd
Binary file not shown.
Binary file added tools/naturaldocs/Data/ImageReferenceTable.nd
Binary file not shown.
Binary file added tools/naturaldocs/Data/IndexInfo.nd
Binary file not shown.
Binary file added tools/naturaldocs/Data/PreviousMenuState.nd
Binary file not shown.
Binary file added tools/naturaldocs/Data/PreviousSettings.nd
Binary file not shown.
Binary file added tools/naturaldocs/Data/SymbolTable.nd
Binary file not shown.
131 changes: 131 additions & 0 deletions tools/naturaldocs/Languages.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
Format: 1.52

# This is the Natural Docs languages file for this project. If you change
# anything here, it will apply to THIS PROJECT ONLY. If you'd like to change
# something for all your projects, edit the Languages.txt in Natural Docs'
# Config directory instead.


# You can prevent certain file extensions from being scanned like this:
# Ignore Extensions: [extension] [extension] ...


#-------------------------------------------------------------------------------
# SYNTAX:
#
# Unlike other Natural Docs configuration files, in this file all comments
# MUST be alone on a line. Some languages deal with the # character, so you
# cannot put comments on the same line as content.
#
# Also, all lists are separated with spaces, not commas, again because some
# languages may need to use them.
#
# Language: [name]
# Alter Language: [name]
# Defines a new language or alters an existing one. Its name can use any
# characters. If any of the properties below have an add/replace form, you
# must use that when using Alter Language.
#
# The language Shebang Script is special. It's entry is only used for
# extensions, and files with those extensions have their shebang (#!) lines
# read to determine the real language of the file. Extensionless files are
# always treated this way.
#
# The language Text File is also special. It's treated as one big comment
# so you can put Natural Docs content in them without special symbols. Also,
# if you don't specify a package separator, ignored prefixes, or enum value
# behavior, it will copy those settings from the language that is used most
# in the source tree.
#
# Extensions: [extension] [extension] ...
# [Add/Replace] Extensions: [extension] [extension] ...
# Defines the file extensions of the language's source files. You can
# redefine extensions found in the main languages file. You can use * to
# mean any undefined extension.
#
# Shebang Strings: [string] [string] ...
# [Add/Replace] Shebang Strings: [string] [string] ...
# Defines a list of strings that can appear in the shebang (#!) line to
# designate that it's part of the language. You can redefine strings found
# in the main languages file.
#
# Ignore Prefixes in Index: [prefix] [prefix] ...
# [Add/Replace] Ignored Prefixes in Index: [prefix] [prefix] ...
#
# Ignore [Topic Type] Prefixes in Index: [prefix] [prefix] ...
# [Add/Replace] Ignored [Topic Type] Prefixes in Index: [prefix] [prefix] ...
# Specifies prefixes that should be ignored when sorting symbols in an
# index. Can be specified in general or for a specific topic type.
#
#------------------------------------------------------------------------------
# For basic language support only:
#
# Line Comments: [symbol] [symbol] ...
# Defines a space-separated list of symbols that are used for line comments,
# if any.
#
# Block Comments: [opening sym] [closing sym] [opening sym] [closing sym] ...
# Defines a space-separated list of symbol pairs that are used for block
# comments, if any.
#
# Package Separator: [symbol]
# Defines the default package separator symbol. The default is a dot.
#
# [Topic Type] Prototype Enders: [symbol] [symbol] ...
# When defined, Natural Docs will attempt to get a prototype from the code
# immediately following the topic type. It stops when it reaches one of
# these symbols. Use \n for line breaks.
#
# Line Extender: [symbol]
# Defines the symbol that allows a prototype to span multiple lines if
# normally a line break would end it.
#
# Enum Values: [global|under type|under parent]
# Defines how enum values are referenced. The default is global.
# global - Values are always global, referenced as 'value'.
# under type - Values are under the enum type, referenced as
# 'package.enum.value'.
# under parent - Values are under the enum's parent, referenced as
# 'package.value'.
#
# Perl Package: [perl package]
# Specifies the Perl package used to fine-tune the language behavior in ways
# too complex to do in this file.
#
#------------------------------------------------------------------------------
# For full language support only:
#
# Full Language Support: [perl package]
# Specifies the Perl package that has the parsing routines necessary for full
# language support.
#
#-------------------------------------------------------------------------------

# The following languages are defined in the main file, if you'd like to alter
# them:
#
# Text File, Shebang Script, C/C++, C#, Java, JavaScript, Perl, Python,
# PHP, SQL, Visual Basic, Pascal, Assembly, Ada, Tcl, Ruby, Makefile,
# ActionScript, ColdFusion, R, Fortran

# If you add a language that you think would be useful to other developers
# and should be included in Natural Docs by default, please e-mail it to
# languages [at] naturaldocs [dot] org.


Language: SQF

Extensions: sqf sqs hpp cpp
Ignore Function Prefixes in Index: OCAP_main_fnc_ OCAP_extension_fnc_ OCAP_recorder_fnc_
Ignore Variable Prefixes in Index: OCAP_ OCAP_main_ OCAP_extension_ OCAP_recorder_
Ignore CBA Event Prefixes in Index: OCAP_ OCAP_recorder_
Ignore Event Handler Prefix in Index: OCAP_EH_
Ignore CBA Setting Prefixes in Index: OCAP_ OCAP_settings_
Line Comment: //
Block Comment: /* */
Function Prototype Ender: };
Variable Prototype Ender: =
Macro Prototype Ender: \n
CBA Event Prototype Enders: ; \n
Event Handler Prototype Ender: \n
Line Extender: `
99 changes: 99 additions & 0 deletions tools/naturaldocs/Menu.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
Format: 1.52


Title: OCAP2
SubTitle: Operations Capture and Playback

Footer: Maintained by the OCAP2 team
Timestamp: yyyy-mm-dd
# m - One or two digit month. January is "1"
# mm - Always two digit month. January is "01"
# mon - Short month word. January is "Jan"
# month - Long month word. January is "January"
# d - One or two digit day. 1 is "1"
# dd - Always two digit day. 1 is "01"
# day - Day with letter extension. 1 is "1st"
# yy - Two digit year. 2006 is "06"
# yyyy - Four digit year. 2006 is "2006"
# year - Four digit year. 2006 is "2006"


# --------------------------------------------------------------------------
#
# Cut and paste the lines below to change the order in which your files
# appear on the menu. Don't worry about adding or removing files, Natural
# Docs will take care of that.
#
# You can further organize the menu by grouping the entries. Add a
# "Group: [name] {" line to start a group, and add a "}" to end it.
#
# You can add text and web links to the menu by adding "Text: [text]" and
# "Link: [name] ([URL])" lines, respectively.
#
# The formatting and comments are auto-generated, so don't worry about
# neatness when editing the file. Natural Docs will clean it up the next
# time it is run. When working with groups, just deal with the braces and
# forget about the indentation and comments.
#
# --------------------------------------------------------------------------


Link: Wiki (https://ocap2.notion.site/Operations-Capture-and-Playback-2-9b868db4414f4ea4830f0f4b1cbacb54)
Link: Github (https://github.com/OCAP2/OCAP)
Link: Issues (https://github.com/OCAP2/OCAP/issues)
Link: Download (https://github.com/OCAP2/OCAP/releases)
Index: Index (Everything)
Function Index: Index (Functions)
Variable Index: Index (Variables)
Macro Index: Index (Macros)
File Index: Index (Files)
Event Handler Index: A3 Event Handlers
CBA Setting Index: CBA Settings
CBA Event Index: CBA Events

Group: main {

File: CBA Settings (main\XEH_preInit.sqf)
File: script_component.hpp (main\script_component.hpp)
File: script_macros.hpp (main\script_macros.hpp)
} # Group: main

Group: extension {

File: fnc_sendData.sqf (extension\fnc_sendData.sqf)
File: script_component.hpp (extension\script_component.hpp)
} # Group: extension

Group: recorder {

File: CBA Settings (recorder\XEH_preInit.sqf)
File: fnc_aceExplosives.sqf (recorder\fnc_aceExplosives.sqf)
File: fnc_addEventMission.sqf (recorder\fnc_addEventMission.sqf)
File: fnc_addUnitEventHandlers.sqf (recorder\fnc_addUnitEventHandlers.sqf)
File: fnc_adminUIControl.sqf (recorder\fnc_adminUIcontrol.sqf)
File: fnc_captureLoop.sqf (recorder\fnc_captureLoop.sqf)
File: fnc_eh_connected.sqf (recorder\fnc_eh_connected.sqf)
File: fnc_eh_disconnected.sqf (recorder\fnc_eh_disconnected.sqf)
File: fnc_eh_firedMan.sqf (recorder\fnc_eh_firedMan.sqf)
File: fnc_eh_killed.sqf (recorder\fnc_eh_killed.sqf)
File: fnc_eh_onUserAdminStateChanged.sqf (recorder\fnc_eh_onUserAdminStateChanged.sqf)
File: fnc_eh_projectileHit.sqf (recorder\fnc_eh_projectileHit.sqf)
File: fnc_entityMonitors.sqf (recorder\fnc_entityMonitors.sqf)
File: fnc_exportData.sqf (recorder\fnc_exportData.sqf)
File: fnc_getAmmoMarkerData.sqf (recorder\fnc_getAmmoMarkerData.sqf)
File: fnc_getClass.sqf (recorder\fnc_getClass.sqf)
File: fnc_getEventWeaponText.sqf (recorder\fnc_getEventWeaponText.sqf)
File: fnc_getInstigator.sqf (recorder\fnc_getInstigator.sqf)
File: fnc_getUnitType.sqf (recorder\fnc_getUnitType.sqf)
File: fnc_getWeaponDisplayData.sqf (recorder\fnc_getWeaponDisplayData.sqf)
File: fnc_handleCustomEvent.sqf (recorder\fnc_handleCustomEvent.sqf)
File: fnc_handleMarkers.sqf (recorder\fnc_handleMarkers.sqf)
File: fnc_init.sqf (recorder\fnc_init.sqf)
File: fnc_isKindOfApc.sqf (recorder\fnc_isKindOfApc.sqf)
File: fnc_projectileMonitors.sqf (recorder\fnc_projectileMonitors.sqf)
File: fnc_startRecording.sqf (recorder\fnc_startRecording.sqf)
File: fnc_stopRecording.sqf (recorder\fnc_stopRecording.sqf)
File: fnc_updateTime.sqf (recorder\fnc_updateTime.sqf)
File: script_component.hpp (recorder\script_component.hpp)
} # Group: recorder

Loading

0 comments on commit fecd04c

Please sign in to comment.