Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Music functionality #598

Merged
merged 37 commits into from
May 7, 2017
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
9626a95
Create config.cpp
fishykins Feb 22, 2017
c1967a7
Create CfgMusic.hpp
fishykins Feb 22, 2017
0bd367b
Create CfgFunctions.hpp
fishykins Feb 22, 2017
410492c
Create script_component.hpp
fishykins Feb 22, 2017
9ab739b
Create fnc_compileMusic.sqf
fishykins Feb 22, 2017
a67a6e0
Create fnc_getMusicData.sqf
fishykins Feb 22, 2017
c35da7d
Create fnc_getMusicPath.sqf
fishykins Feb 22, 2017
3819c2b
Create fnc_getMusicPlaying
fishykins Feb 22, 2017
06d55d2
Rename fnc_getMusicPlaying to fnc_getMusicPlaying.sqf
fishykins Feb 22, 2017
097c336
Create fnc_playMusic.sqf
fishykins Feb 22, 2017
25c8fef
Create fnc_searchMusic.sqf
fishykins Feb 22, 2017
aaaeed6
Create fnc_stopMusic.sqf
fishykins Feb 22, 2017
7aa2ddb
Update script_component.hpp
fishykins Feb 22, 2017
e3b5447
Update fnc_compileMusic.sqf
fishykins Feb 22, 2017
3957e01
Update config.cpp
fishykins Feb 23, 2017
3c2b703
Update CfgFunctions.hpp
fishykins Feb 23, 2017
5ae06cd
Update fnc_getMusicData.sqf
fishykins Feb 23, 2017
e66ad53
Update fnc_getMusicPath.sqf
fishykins Feb 23, 2017
fb596b6
Update fnc_getMusicPlaying.sqf
fishykins Feb 23, 2017
9615d2b
Update fnc_playMusic.sqf
fishykins Feb 23, 2017
924d38c
Update fnc_searchMusic.sqf
fishykins Feb 23, 2017
6258a15
Update fnc_stopMusic.sqf
fishykins Feb 23, 2017
e22e983
Update CfgFunctions.hpp
fishykins Feb 23, 2017
befaa7d
Update fnc_searchMusic.sqf
fishykins Feb 23, 2017
45bded6
Update CfgMusic.hpp
fishykins Feb 23, 2017
4bcec6c
Update fnc_searchMusic.sqf
fishykins Mar 5, 2017
f527625
Updated to camelCase
fishykins Mar 5, 2017
75b2f06
Lots of formatting and edits
fishykins Mar 8, 2017
cf6bc98
Create fnc_findMusic.sqf
fishykins Mar 9, 2017
f0f5f71
More fixes for the approval of the mob
fishykins Mar 9, 2017
d437beb
"forEach" not working with configs for some unknown reason...
fishykins Mar 9, 2017
c4c2add
Tweaked as per comments
fishykins Mar 9, 2017
2f42698
Fixed tabs in CfgMusic
fishykins Mar 9, 2017
d87b29f
Fixed some typos
fishykins Mar 20, 2017
29c0d88
support for APEX music+ minor improvements
fishykins Apr 10, 2017
309d43d
Improved getMusicData, tidied up headers
fishykins Apr 10, 2017
de10876
tabs fix
fishykins Apr 10, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions addons/music/CfgFunctions.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
class CfgFunctions
{
class CBA
{
class Music
{
// CBA_fnc_getMusicPath
class getMusicPath
{
description = "Get the config path of given music class";
file = "\x\cba\addons\music\fnc_getMusicPath.sqf";
};
// CBA_fnc_getMusicData
class getMusicData
{
description = "Get data attached to music class";
file = "\x\cba\addons\music\fnc_getMusicData.sqf";
};
// CBA_fnc_findMusic
class findMusic
{
description = "Find music of specified type";
file = "\x\cba\addons\music\fnc_findMusic.sqf";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is missing. Add the file, or remove the class.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added

};
// CBA_fnc_compileMusic
class compileMusic
{
description = "Find all music in game";
file = "\x\cba\addons\music\fnc_compileMusic.sqf";
};
// CBA_fnc_getMusicPlaying
class getMusicPlaying
{
description = "Returns the data on currently playing music";
file = "\x\cba\addons\music\fnc_getMusicPlaying.sqf";
};
// CBA_fnc_isMusicPlaying
class isMusicPlaying
{
description = "Returns if music is playing or not";
file = "\x\cba\addons\music\fnc_isMusicPlaying.sqf";
};
// CBA_fnc_playMusic
class playMusic
{
description = "Play a given track";
file = "\x\cba\addons\music\fnc_playMusic.sqf";
};
// CBA_fnc_stopMusic
class stopMusic
{
description = "Stops the music playing";
file = "\x\cba\addons\music\fnc_stopMusic.sqf";
};
};
};
};
Loading