1 | Index: trunk/binaries/data/config/default.cfg
|
---|
2 | ===================================================================
|
---|
3 | --- trunk/binaries/data/config/default.cfg (revision 17717)
|
---|
4 | +++ trunk/binaries/data/config/default.cfg (working copy)
|
---|
5 | @@ -323,6 +323,7 @@
|
---|
6 | attacknotificationmessage = true ; Show attack notification messages
|
---|
7 | camerajump.threshold = 40 ; How close do we have to be to the actual location in order to jump back to the previous one?
|
---|
8 | timeelapsedcounter = false ; Show the game duration in the top right corner
|
---|
9 | +objectstitle = 2 ;
|
---|
10 |
|
---|
11 | [gui.session.minimap]
|
---|
12 | blinkduration = 1.7 ; The blink duration while pinging
|
---|
13 | Index: trunk/binaries/data/mods/public/gui/common/functions_utility.js
|
---|
14 | ===================================================================
|
---|
15 | --- trunk/binaries/data/mods/public/gui/common/functions_utility.js (revision 17717)
|
---|
16 | +++ trunk/binaries/data/mods/public/gui/common/functions_utility.js (working copy)
|
---|
17 | @@ -55,7 +55,79 @@
|
---|
18 | return 0;
|
---|
19 | }
|
---|
20 |
|
---|
21 | +function getTemplateLabels(genericName,specificName)
|
---|
22 | +{
|
---|
23 | + var titleType = Engine.ConfigDB_GetValue("user", "gui.session.objectstitle");
|
---|
24 | + if (titleType == "0")
|
---|
25 | + {
|
---|
26 | + specificName = genericName;
|
---|
27 | + }
|
---|
28 | + else if (titleType == "1")
|
---|
29 | + {
|
---|
30 | + genericName = specificName;
|
---|
31 | + }
|
---|
32 | + else
|
---|
33 | + {
|
---|
34 | + //not need to do any changes
|
---|
35 | + }
|
---|
36 | +
|
---|
37 | + if (specificName == undefined)
|
---|
38 | + specificName = "???";
|
---|
39 | + if (genericName == undefined)
|
---|
40 | + genericName = "???";
|
---|
41 | +
|
---|
42 | + return { "primary" : genericName, "secondary" : specificName };
|
---|
43 | +}
|
---|
44 | +
|
---|
45 | Index: trunk/binaries/data/mods/public/gui/common/tooltips.js
|
---|
46 | ===================================================================
|
---|
47 | --- trunk/binaries/data/mods/public/gui/common/tooltips.js (revision 17717)
|
---|
48 | +++ trunk/binaries/data/mods/public/gui/common/tooltips.js (working copy)
|
---|
49 | @@ -506,9 +506,12 @@
|
---|
50 | function getEntityNamesFormatted(template)
|
---|
51 | {
|
---|
52 | let names = "";
|
---|
53 | - let generic = template.name.generic;
|
---|
54 | - let specific = template.name.specific;
|
---|
55 | - if (specific)
|
---|
56 | +
|
---|
57 | + var templates = getTemplateLabels(template.name.generic,template.name.specific);
|
---|
58 | + let generic = templates.primary;
|
---|
59 | + let specific = templates.secondary;
|
---|
60 | +
|
---|
61 | + if (specific != generic)
|
---|
62 | {
|
---|
63 | // drop caps for specific name
|
---|
64 | names += '[font="sans-bold-16"]' + specific[0] + '[/font]' +
|
---|
65 | Index: trunk/binaries/data/mods/public/gui/options/options.json
|
---|
66 | ===================================================================
|
---|
67 | --- trunk/binaries/data/mods/public/gui/options/options.json (revision 17717)
|
---|
68 | +++ trunk/binaries/data/mods/public/gui/options/options.json (working copy)
|
---|
69 | @@ -54,6 +54,12 @@
|
---|
70 | "label": "Persist Match Settings",
|
---|
71 | "tooltip": "Save and restore match settings for quick reuse when hosting another game",
|
---|
72 | "parameters": { "config": "persistmatchsettings" }
|
---|
73 | + },
|
---|
74 | + {
|
---|
75 | + "type": "dropdown",
|
---|
76 | + "label": "Object title",
|
---|
77 | + "tooltip": "Object title",
|
---|
78 | + "parameters": { "list": [ "Generic", "Specific", "Both" ], "config": "gui.session.objectstitle" }
|
---|
79 | }
|
---|
80 | ],
|
---|
81 | "graphicsSetting":
|
---|
82 | Index: trunk/binaries/data/mods/public/gui/session/selection_details.js
|
---|
83 | ===================================================================
|
---|
84 | --- trunk/binaries/data/mods/public/gui/session/selection_details.js (revision 17717)
|
---|
85 | +++ trunk/binaries/data/mods/public/gui/session/selection_details.js (working copy)
|
---|
86 | @@ -232,6 +232,10 @@
|
---|
87 | }
|
---|
88 |
|
---|
89 | // Set Player details
|
---|
90 | + var templates = getTemplateLabels(genericName,specificName);
|
---|
91 | + genericName = templates.primary;
|
---|
92 | + specificName = templates.secondary;
|
---|
93 | +
|
---|
94 | Engine.GetGUIObjectByName("specific").caption = specificName;
|
---|
95 | Engine.GetGUIObjectByName("player").caption = playerName;
|
---|
96 | Engine.GetGUIObjectByName("playerColorBackground").sprite = "color: " + playerColor;
|
---|