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

Spectator #2083

Merged
merged 46 commits into from
Aug 29, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
33314f8
Adjust spectator camera boom speed
kymckay Jul 31, 2015
777d8f6
Merge branch 'master' into spectator
kymckay Jul 31, 2015
612aa2d
Separate spectator physical and virtual states
kymckay Aug 1, 2015
38e08d5
Clear spectator display variable at preInit
kymckay Aug 2, 2015
63c034e
Differentiate between staged and set spectators
kymckay Aug 2, 2015
5246018
Enable spectator on death system
kymckay Aug 2, 2015
9b764bb
Preserve Polish translations from master branch
kymckay Aug 2, 2015
b87b4ea
Improve spectator GUI reopening prevention
kymckay Aug 2, 2015
98b088f
Fix pre-spectator position saving
kymckay Aug 2, 2015
f5e7185
Fix spectator camera exiting mechanism
kymckay Aug 3, 2015
5bfa4e5
Improve spectator camera vision mode on start
kymckay Aug 3, 2015
7e9500f
Enable ace_spectator respawn framework integration
kymckay Aug 3, 2015
1b12d37
Replace spectator respawn changes with a template
kymckay Aug 4, 2015
79e6078
Add contributor email for Head
kymckay Aug 5, 2015
07e09b6
Stop spectator camera unit changing on corpses
kymckay Aug 5, 2015
5200fd6
Add new option to spectator unit filter setting
kymckay Aug 5, 2015
42b5aba
Add support for respawn counter to spectator UI
kymckay Aug 5, 2015
c808021
Tweak spectator interface layout
kymckay Aug 5, 2015
d1975a5
Improve spectator pause menu emulation
kymckay Aug 5, 2015
d6cc14a
Add zeus support to spectator UI
kymckay Aug 5, 2015
92ef0bf
Whitelist spectator free camera boom keys
kymckay Aug 6, 2015
bcb21b7
Overhaul spectator icon handling and rendering
kymckay Aug 6, 2015
4c9b6e9
Overhaul and improve spectator unit tree UX
kymckay Aug 6, 2015
f59536b
Remove legacy spectator settings module argument
kymckay Aug 6, 2015
043c5c4
Improve spectator help window layout
kymckay Aug 7, 2015
485f943
Change spectator UI toggle to include help window
kymckay Aug 7, 2015
f143db7
Draw player names on spectator map
kymckay Aug 7, 2015
702e50b
Improve spectator UI respawn counter blending
kymckay Aug 7, 2015
1c79c8f
Update spectator UI styling
kymckay Aug 7, 2015
c5d9ec5
Add speed boost button to spectator free camera
kymckay Aug 7, 2015
57bda37
Adjust spectator free camera speed with zoom
kymckay Aug 7, 2015
e59f0ce
Fix spectator respawn template for types 0 and 1
kymckay Aug 8, 2015
5b88122
Allow admins to use chat in the spectator UI
kymckay Aug 8, 2015
be7b156
Add "focus on unit" to spectator free camera
kymckay Aug 8, 2015
d773010
Update ace_spectator readme
kymckay Aug 8, 2015
213deef
Add keys to adjust spectator camera speed and zoom
kymckay Aug 8, 2015
182eef3
Adjust spectator camera pan and tilt with zoom
kymckay Aug 8, 2015
c30cb45
Optimize spectator UI held key prevention system
kymckay Aug 9, 2015
95aa9f6
Fix manual pre-setting of spectator camera unit
kymckay Aug 11, 2015
21b0ee0
Add spectator UI interrupt system
kymckay Aug 21, 2015
152faf6
Improve spectator interface entry and exit
kymckay Aug 23, 2015
0fa1004
pl translation of spectator
gienkov Aug 24, 2015
288457d
fix
gienkov Aug 24, 2015
ffcf0ec
Merge pull request #2253 from gienkov/spectator-pl-translation
kymckay Aug 25, 2015
200f44d
Adjust spectator camera speed based on height
kymckay Aug 29, 2015
620136a
Merge branch 'master' into spectator
kymckay Aug 29, 2015
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
1 change: 1 addition & 0 deletions addons/spectator/$PBOPREFIX$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
z\ace\addons\spectator
22 changes: 22 additions & 0 deletions addons/spectator/ACE_Settings.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
class ACE_Settings {
class GVAR(filterUnits) {
typeName = "SCALAR";
value = 2;
values[] = {CSTRING(units_none), CSTRING(units_players), CSTRING(units_playable), CSTRING(units_all)};
};
class GVAR(filterSides) {
typeName = "SCALAR";
value = 0;
values[] = {CSTRING(sides_player), CSTRING(sides_friendly), CSTRING(sides_hostile), CSTRING(sides_all)};
};
class GVAR(restrictModes) {
typeName = "SCALAR";
value = 0;
values[] = {CSTRING(modes_all), CSTRING(modes_unit), CSTRING(modes_free), CSTRING(modes_internal), CSTRING(modes_external)};
};
class GVAR(restrictVisions) {
typeName = "SCALAR";
value = 0;
values[] = {CSTRING(modes_all), CSTRING(visions_nv), CSTRING(visions_ti), "$STR_Special_None"};
};
};
11 changes: 11 additions & 0 deletions addons/spectator/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
class Extended_PreInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preInit));
};
};

class Extended_PostInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_postInit));
};
};
117 changes: 117 additions & 0 deletions addons/spectator/CfgVehicles.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
class CfgVehicles {
class ACE_Module;
class GVAR(moduleSettings): ACE_Module {
scope = 2;
displayName = CSTRING(Settings_DisplayName);
icon = PATHTOF(UI\Icon_Module_Spectator_ca.paa);
category = "ACE";
function = QFUNC(moduleSpectatorSettings);
isGlobal = 1;
author = ECSTRING(common,ACETeam);
class Arguments {
class unitsFilter {
displayName = CSTRING(units_DisplayName);
description = CSTRING(units_Description);
typeName = "NUMBER";
class values {
class none {
name = CSTRING(units_none);
value = 0;
};
class players {
name = CSTRING(units_players);
value = 1;
};
class playable {
name = CSTRING(units_playable);
value = 2;
default = 1;
};
class all {
name = CSTRING(units_all);
value = 3;
};
};
};
class sidesFilter {
displayName = CSTRING(sides_DisplayName);
description = CSTRING(sides_Description);
typeName = "NUMBER";
class values {
class player {
name = CSTRING(sides_player);
value = 0;
default = 1;
};
class friendly {
name = CSTRING(sides_friendly);
value = 1;
};
class hostile {
name = CSTRING(sides_hostile);
value = 2;
};
class all {
name = CSTRING(sides_all);
value = 3;
};
};
};
class cameraModes {
displayName = CSTRING(modes_DisplayName);
description = CSTRING(modes_Description);
typeName = "NUMBER";
class values {
class all {
name = CSTRING(modes_all);
value = 0;
default = 1;
};
class unit {
name = CSTRING(modes_unit);
value = 1;
};
class free {
name = CSTRING(modes_free);
value = 2;
};
class internal {
name = CSTRING(modes_internal);
value = 3;
};
class external {
name = CSTRING(modes_external);
value = 4;
};
};
};
class visionModes {
displayName = CSTRING(visions_DisplayName);
description = CSTRING(visions_Description);
typeName = "NUMBER";
class values {
class all {
name = CSTRING(modes_all);
value = 0;
default = 1;
};
class nv {
name = CSTRING(visions_nv);
value = 1;
};
class ti {
name = CSTRING(visions_ti);
value = 2;
};
class none {
name = "$STR_Special_None";
value = 3;
};
};
};
};
class ModuleDescription {
description = CSTRING(Settings_Description);
};
};
};
14 changes: 14 additions & 0 deletions addons/spectator/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
ace_spectator
=======

A flexible spectator framework for mission makers to use.

Includes a public API for integration into custom respawn frameworks and a template for use with the vanilla respawn framework.

For more information, see: http://ace3mod.com/wiki/feature/spectator.html

## Maintainers

The people responsible for merging changes to this component or answering potential questions.

- [SilentSpike](https://github.com/SilentSpike)
Binary file added addons/spectator/UI/Icon_Module_Spectator_ca.paa
Binary file not shown.
Loading