HomeWildfire Games
Diffusion 0 A.D. Public Repository rP25691

Map flares
rP25691
Actions

Description

Map flares

Add flaring on the map and resize the minimap buttons.
Target marker and button by Stan.
Reviewed/Commented by wraitii, elexis, vladislavbelov
Refs: #3491
Refs: #57

Differential Revision: https://code.wildfiregames.com/D1751

Details

Committed
ImarokJun 5 2021, 7:37 PM
Differential Revision
D1751: [WIP] Map flares
Parents
rP25690: (Reference Suite) Support aura-based civilization bonuses
Branches
Unknown
Tags
Unknown
Build Status
Buildable 17798
Build 41429: Trigger Windows Autobuild
Build 41428: Post-Commit BuildJenkins
Build 41427: Post-Commit Build (macOS)Jenkins

Event Timeline

Imarok committed rP25691: Map flares.Jun 5 2021, 7:37 PM
Imarok added an edge: D1751: [WIP] Map flares.
Harbormaster completed building B17798: rP25691: Map flares.Jun 5 2021, 7:52 PM
wraitii mentioned this in D4116: Add description for new hotkeys.Jun 7 2021, 7:06 PM
wraitii mentioned this in rP25734: Add description for new hotkeys.Jun 7 2021, 8:45 PM
Silier raised a concern with this commit.Oct 9 2021, 10:29 PM
Silier added a subscriber: Silier.
Silier added inline comments.
/ps/trunk/binaries/data/mods/public/gui/session/input.js
1274

this is an issue.
current code expects "target" to be an actual entity and it should stay like that, 2 data types for one attribute is not good sign
this is passing cordinates causing #6303
I suggest to setup new attribute "position" and make it properly

This commit now has outstanding concerns.Oct 9 2021, 10:29 PM
Freagarach added a subscriber: Freagarach.Oct 10 2021, 8:52 AM
Freagarach added inline comments.
/ps/trunk/binaries/data/mods/public/gui/session/messages.js
289

This is the cause that players playing coop will not see the flare of the other player. Which is inconvenient at least.

Freagarach added inline comments.May 7 2022, 7:58 AM
/ps/trunk/binaries/data/mods/public/gui/session/messages.js
289

(#6207)

Freagarach mentioned this in D4824: Use position for positions in unit_commands.js..Nov 8 2022, 12:01 PM
Silier resigned from this commit.Dec 29 2022, 1:02 PM
This commit no longer requires audit.Dec 29 2022, 1:02 PM
Silier removed an auditor: Silier.Dec 29 2022, 1:03 PM

Changes (44)

PathSize
ps/
trunk/
binaries/
data/
config/
mods/
mod/
gui/
public/
art/
actors/
special/
animation/
other/
meshes/
skeletal/
skeletons/
textures/
animated/
minimap-flare/
cursors/
skins/
skeletal/
ui/
session/
gui/
manual/
session/
minimap/
simulation/
components/
helpers/
templates/
special/
source/
gui/
ObjectTypes/
Scripting/

rP25691

View Options

ps/trunk/binaries/data/config/default.cfg

Loading...
View Options

ps/trunk/binaries/data/mods/mod/gui/gui.rng

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/special/flare_target_marker.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/animation/other/flare_target_marker_idle.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/meshes/skeletal/flare_target_marker.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/skeletons/flare-marker-armature.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame00.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame01.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame02.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame03.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame04.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame05.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame06.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame07.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame08.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame09.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame10.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame11.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame12.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame13.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame14.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/animated/minimap-flare/frame15.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/cursors/action-flare.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/cursors/action-flare.txt

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/skins/skeletal/flare_target_marker_diffuse.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/skins/skeletal/flare_target_marker_spec.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/minimap-flare-highlight.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/textures/ui/session/minimap-flare.png

Loading...
View Options

ps/trunk/binaries/data/mods/public/gui/manual/intro.txt

Loading...
View Options

ps/trunk/binaries/data/mods/public/gui/session/input.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/gui/session/messages.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMap.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMap.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMapFlareButton.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMapPanel.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/gui/session/unit_actions.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/helpers/Commands.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/special/flare_target_marker.xml

Loading...
View Options

ps/trunk/source/gui/GUIObjectTypes.cpp

Loading...
View Options

ps/trunk/source/gui/ObjectTypes/CMiniMap.cpp

Loading...
View Options

ps/trunk/source/gui/ObjectTypes/CMiniMap.h

Loading...
View Options

ps/trunk/source/gui/Scripting/JSInterface_GUIProxy.cpp

Loading...
Wildfire Games · Phabricator