1
0
forked from 0ad/0ad
Commit Graph

13799 Commits

Author SHA1 Message Date
Angen
67a4c18c74 Disband formation instead destroying
Fix missed line change in 9c2e9d7893 when rebasing D1462

This was SVN commit r23454.
2020-01-28 19:31:04 +00:00
f98cbb290a Support GUI script includes in included XML files to further decoupling of GUI page contents, refs #5387.
Differential Revision: https://code.wildfiregames.com/D2599
Comment By: Stan, Vladislav
This was SVN commit r23452.
2020-01-28 01:06:34 +00:00
dbdd1dc01b Fix a typo and a duplicated prop noticed by @elexis and checkrefs.pl. Remove a duplicated sail prop.
This was SVN commit r23451.
2020-01-27 22:50:38 +00:00
Angen
9c2e9d7893 Enforce formation required member count
Disband formation with less memebers than required.
Do not allow one member in formation.
Show only formations entities actually are allowed to form. (do not show
wedge for infantry)

Differential Revision: https://code.wildfiregames.com/D1462
Fixes: #5119
Comments by: elexis, bb, temple, Stan, Freagarach
This was SVN commit r23450.
2020-01-27 17:49:06 +00:00
Angen
17c9950cee Fix entities not retaining repair order after target transforms
Update this.repairTarget in UnitAI when target renames.
Transfer builders among renamed entities.

Differential Revision: https://code.wildfiregames.com/D2360
Patch by: @Freagarach
Comments by: Stan, elexis
This was SVN commit r23449.
2020-01-27 17:14:30 +00:00
Angen
82a5ab6d19 Allow status effect to apply modifiers and fix 2333b1814e
Status effect can apply modifier to the entity (armour strength, walking
speed, ...)
This is also hiding status effect icons by default in selection detail.
Fixing smaller related bugs.

Differential Revision: https://code.wildfiregames.com/D2281
Patch by: @Freagarach
Comments by: Stan, wraitii
This was SVN commit r23448.
2020-01-27 16:51:25 +00:00
968a208ac0 Remove transparency from horses bodies.
This was SVN commit r23444.
2020-01-26 17:01:56 +00:00
8954dbd110 Update the siege engines to not use transparency where not necessary.
This was SVN commit r23443.
2020-01-26 17:00:55 +00:00
1bcc38242d Update roman civic center to use less transparency.
This was SVN commit r23442.
2020-01-26 16:59:02 +00:00
9abe10c42a Remove some transparency from helmets.
This was SVN commit r23441.
2020-01-26 16:57:36 +00:00
993dd3a958 Update persian merchant ship mesh to reduce the amount of transparency.
This was SVN commit r23440.
2020-01-26 16:56:39 +00:00
ba0eef2003 Remove basic_trans from greaves to improve performance.
This was SVN commit r23439.
2020-01-26 16:53:48 +00:00
c3a263f1d7 Fix Danubius triggerscript warnings when playing with DisabledTreasures following 6113edd746, reported by mord and nani.
Differential Revision: https://code.wildfiregames.com/D1690
Reviewed By: bb
This was SVN commit r23438.
2020-01-26 16:29:52 +00:00
ccea97670e CSlider inherits IGUIButtonBehavior to gains button sounds, press/release events, duplication removal, continuation of sliding if the object is not hovered while the button is still pressed, refs #2593, c016a74309/D325, 359df88f1a/D1622.
Use the events to fix jittering of the gamesetup slider in
multiplayermode, refs 352d4ea78f/D2571.

Differential Revision: https://code.wildfiregames.com/D2592
Reviewed By: nani
Comments By: Vladislav
This was SVN commit r23435.
2020-01-24 00:56:51 +00:00
8e3f6439db Gamestup option to select the time the sea level starts to rise on Extinct Volcano (and other maps thay may want to use it), refs #4838.
Differential Revision: https://code.wildfiregames.com/D2593
This was SVN commit r23434.
2020-01-23 15:58:35 +00:00
bb
33365b6392 Remove trailing 0's from Armour items in templates
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D2280
This was SVN commit r23432.
2020-01-22 22:23:16 +00:00
bb
0cf8d207fb Merge kushites champion infantry attack bonusses
Patch By: Freagarach
Differential Revision: https://code.wildfiregames.com/D2262
This was SVN commit r23431.
2020-01-22 22:13:43 +00:00
352d4ea78f Gamesetup slider support, use it for Ceasefire, RelicCount, RelicDuration, WonderDuration.
Use Math.round until the slider GUI object type supports fixed step
sizes, refs D406.

Differential Revision: https://code.wildfiregames.com/D2571
Comments By: Vladislav (irc), nani (PM), bb (irc), Stan
This was SVN commit r23430.
2020-01-22 21:37:14 +00:00
c50a621cea Disable Quicksave during multiplayer, since the feature is not implemented and triggering it can crash the turnmanager.
Differential Revision: https://code.wildfiregames.com/D2584
Comments By: Stan
This was SVN commit r23429.
2020-01-22 14:05:17 +00:00
ed0a3f4290 Fix two incorrect icons.
Noticed by: @Nescio
Refs: 702d92ec86

This was SVN commit r23428.
2020-01-20 22:58:36 +00:00
f9b0d5e365 Use a non transparent material to improve performance.
This was SVN commit r23427.
2020-01-20 22:13:27 +00:00
702d92ec86 Delete duplicate and deprecated unit icons.
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2586
This was SVN commit r23422.
2020-01-20 18:37:05 +00:00
d584d2dcde Update hero icons and names
→ sets a generic icon (the golden laurel wreath) in
template_unit_hero.xml
→ removes icons from hero templates that used one belonging to another
hero
→ corrects hero icons, generic names, and specific names where necessary

Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2582
This was SVN commit r23421.
2020-01-20 14:02:32 +00:00
5ca68a38ef Rewrite Gamesetup AIConfig page to use class syntax, decouple settings and move it to the Gamesetup subfolder context, refs #5322, #5387.
This establishes a code architecture where only one class and only one
page is responsible per AI setting,
removes the hardcodings from the XML and JS file,
allowing future patches and mods to insert, remove and edit independent
AI settings without having to overwrite the existing code.

Differential Revision: https://code.wildfiregames.com/D2577
See also 0550315161/D2581 and comments linked there.

This was SVN commit r23419.
2020-01-20 09:29:43 +00:00
63d8d579d7 Options page dropdown support for per-value hovered tooltips.
Differential Revision: https://code.wildfiregames.com/D2576
Preparation for: D2546
Accepted By: Vladislav
This was SVN commit r23414.
2020-01-18 20:40:33 +00:00
0550315161 Gamesetup subpages support.
Split SetupWindow from GameSetupPage class.
Create Gamesetup/Pages subfolder, starting with the existing
GameSetupPage and LoadingPage.
Run the subpage in the same GUI script context instead of separate
pages.
Planned subpages are AIConfigPage (refs D2577), MapBrowser (D1703), hero
selection dialog, civ selection (refs #3987), starting resources,
population capacity (refs #4379, #812...).

This allows:
- subpages to benefit from direct access and reuse of the gamesetup
controlers, (f.e. gameSettingsControl, playerAssignmentsControl,
mapCache, netMessages, ...), deduplication.
- subpages to handle events and control gamesettings even if the
according subpage is closed (for example deleting AIBehavior if there is
no AI assigned).
- to keep gamesettings decoupled, i.e. exactly one class per setting
(for this example avoiding that both GameSetupPage/AIConfigButton and
AIConfigPage/AIBehavior control the AIBehavior setting value.).

Differential Revision: https://code.wildfiregames.com/D2581
Comments By: Vladislav
(http://irclogs.wildfiregames.com/2020-01/2020-01-18-QuakeNet-%230ad-dev.log),
nani (PM)

This was SVN commit r23413.
2020-01-18 19:42:58 +00:00
1750b0b34c Fixes GLES mode builds on Mesa and running on Intel Iris drivers.
Patch By: linkmauve
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D2448
This was SVN commit r23410.
2020-01-17 21:13:51 +00:00
Angen
220f1be652 Allow to garrison animals.
Implementing decision to let animals garrison taken on irc
http://irclogs.wildfiregames.com/2013-12/2013-12-03-QuakeNet-%230ad-dev.log
relevant for ticket #1907.

Differential Revision: https://code.wildfiregames.com/D1961
Patch by: @Freagarach
This was SVN commit r23409.
2020-01-17 09:40:34 +00:00
Angen
163d710952 Update auras when a formation member renames
Reported on forum:
https://wildfiregames.com/forum/index.php?/topic/25196-when-unit-levels-up-he-loses-armor-bonus-from-athens-hero/

Relevant diff: https://code.wildfiregames.com/D997

Differential Revision: https://code.wildfiregames.com/D1727
Patch by: @Freagarach
This was SVN commit r23408.
2020-01-17 09:32:52 +00:00
eafd44cfc5 Remove counterproductive lowercasing of GUI ScriptEvent names, refs #127.
a8f48ff7e0 introduced XeroXMB lowercasing of element and attribute names
as a feature.
cf9d8b9797, 4d390f501c, dda6268466 added bugfixes and TODOs because of
that.
f76d0ffdc6, 44fe226dd2 removed the XeroXMB lowercase feature.
This patch removes the lowercasing GUI bugfixes that don't fix any bug
anymore while increasing code complexity and lowering performance
(string copies).

Do not send mouse coordinates objects for events that do not relate to
the mouse.

Store event names in static const members to:
(1) improve performance, ensuring that the CStr is not reconstructed
every call,
(2) obtain compile errors when misspelling event names,
(3) allow reuse of the strings in inherited and friend classes.

Differential Revision: https://code.wildfiregames.com/D2445
Comments by Matei, Philip on 2006-03-11-QuakeNet-#wfg-Meeting-0126.log
and 2006-06-24-QuakeNet-#wfg-Meeting-0139.log

This was SVN commit r23403.
2020-01-15 16:00:37 +00:00
fedcc2f0f1 Delete two unused old icons.
Refs: P194

This was SVN commit r23402.
2020-01-15 15:46:53 +00:00
f5808baac8 Don't continue to process pending netmessages in the gamesetup_mp page after having switched to the session page already.
If there was a player rejoining, a "start" and a "playerassignments"
message pending for that player, the playerassignments message would not
update the assignments of the session page, but the one of the obsolete
gamesetup_mp page, thus triggering "unknown player" messages for that
player during the session.
This seems to only happen when two players rejoin simultaneously and
with very rare timing / race condition, and thus was not reproducible
without modifying the code.
Issue since b454ccca79.

Differential Revision: https://code.wildfiregames.com/D2559
Should fix #5660.

This was SVN commit r23401.
2020-01-15 13:34:07 +00:00
f82fd8ed5c Fix lineendings.
This was SVN commit r23400.
2020-01-15 13:24:17 +00:00
b59257a53f Nerf citizen javelinist team bonuses, because they allowed too quick reinforcements and economy boom.
Differential Revision: https://code.wildfiregames.com/D2392
Patch By: ValihrAnt
This was SVN commit r23399.
2020-01-15 12:06:21 +00:00
cca241c322 Fix some oversights in the gamesetup class rewrite 34138a7764/D2483 and one in the landscape gamesetup option D2564/af15d5972d.
* Relic count setting didn't work at all, reported by gameboy.
* GameSettingsPanel columnWidth wasn't lowered when using 1024*768,
necessary when all victory conditions are enabled (two columns),
reported by bb.
* Landscape setting didn't work with the random random map, reported by
bb.
* SavegameDetails used an obsolete function name.

This was SVN commit r23398.
2020-01-15 11:51:42 +00:00
193e607677 gui/manual/intro.txt interpunction
This patch is split from D2305. It does the following:
* replace programmer's quotes () in text with proper opening and closing
quotation marks ()
* start sentences with a capital
*  →
* remove an incorrect colon ()
* use imperative

Author: Nescio

Reviewed By: Gallaecio, Freagarach
Differential Revision: https://code.wildfiregames.com/D2560
This was SVN commit r23397.
2020-01-15 09:42:28 +00:00
49415f8716 Splits debug display of frustums for an easier debugging of a culling and shadows
This was SVN commit r23395.
2020-01-14 23:51:29 +00:00
dc56447328 Optimize resource trickle by not running timers when not necessary.
Reviewed by: @bb
Comments by: @Freagarach
Differential Revision: https://code.wildfiregames.com/D2400
This was SVN commit r23394.
2020-01-14 21:48:32 +00:00
bb
a852bffeaa Standardize modmod buttons width
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D2569
This was SVN commit r23393.
2020-01-14 21:02:48 +00:00
af15d5972d Landscape and Daytime gamesetup options for the Unknown, Danubius and Polar Sea, refs #4838.
Allow gamesetup options other than biome to determine the map peview
image, refs #4962, 8adc6d8e93.
Add previews for the 12 Unknown, 2 Danubius and 2 Polar Sea variations.
Concludes deduplication of the Unknown (0d0bc32736), Unknown Land
(25682da568) and Unknown Nomad (7f8adcf8cb), refs #4317.

Differential Revision: https://code.wildfiregames.com/D2564
This was SVN commit r23392.
2020-01-14 07:02:40 +00:00
0307a642fe Fix gamesetup infinite loop when selecting a falsy (sandbox) AI difficulty following 34138a7764/D2483.
Correctly hide tips panel upon window resize.
Reported by Stan.

This was SVN commit r23391.
2020-01-14 05:46:37 +00:00
c926b53917 Optimize some props by not using transparency.
Noticed by: @vladislavbelov
This was SVN commit r23390.
2020-01-13 23:26:43 +00:00
c942189aac Optimize some helmets by not using transparency when not necessary. EOL
Noticed by: @vladislavbelov
This was SVN commit r23389.
2020-01-13 23:25:56 +00:00
69258604cc Optimize some structures, by not using transparency when not necessary. EOL
Noticed by: @vladislavbelov
This was SVN commit r23388.
2020-01-13 23:24:55 +00:00
bb
79cbb95d12 Move the credits button on main menu
Patch By: Nescio
Comments By: Stan
Differential Revision: https://code.wildfiregames.com/D2430
This was SVN commit r23387.
2020-01-13 18:33:03 +00:00
b0b2f0701d Credit Inari in the credits instead of the commit message of dbb69285a5.
This was SVN commit r23385.
2020-01-13 07:47:30 +00:00
Alexandermb
ae6c6bdbeb Fix head rotation not being properly exported in the resource approaching animation.
This was SVN commit r23379.
2020-01-12 14:33:56 +00:00
Angen
19f4e3ef28 Let splash radius be affected by modifications and rename GetSplashDamage to GetSplashData.
Differential Revision: https://code.wildfiregames.com/D2370
Patch by: @Freagarach
Comments by: Stan
This was SVN commit r23378.
2020-01-12 13:37:14 +00:00
Angen
a84a896672 Use specific walking variants when approaching gathering
Switch to citizen walking with working tools when approaching some
resource to gather from.
It is nice visual change, it removes visual switching between soldier
and citizen when gathering resources.

Differential Revision: https://code.wildfiregames.com/D2518
Related forum posts:
https://wildfiregames.com/forum/index.php?/topic/26012-committed-animations/page/28/

This was SVN commit r23377.
2020-01-12 13:21:09 +00:00
34138a7764 Gamesetup class rewrite, fixes #5322, refs #5387.
* Decouples settings logically which in turn allows fixing many problems
arising from previous coupling.
* Fixes the persist-match-settings feature, refs #2963, refs #3049.
* Improves performance of the matchsetup by rebuilding GUI objects only
when necessary.

Provides groundwork for:
* UI to control per-player handicap, such as StartingResources,
PopulationCap, StartingTechnologies, DisabledTechnologies,
DisabledTemplates, ..., refs #812.
* Map specific settings (onMapChange event), refs #4838.
* Chat notifications announcing which settings changed, refs D1195,
* Multiple controllers setting up the game (since setting types can
check for permissions in onUpdateGameAttributes without the need for a
new data model or a second gamesetup data network message type), refs
#3806, subsequently dedicated server, refs #3556.
* MapBrowser (MapCache, MapTypes, onUpdateGameAttributes interface),
refs D1703 and D1777,
* Multiplayer saved games (decoupling and setting dependent unique
logic), refs #1088.
Refs
https://wildfiregames.com/forum/index.php?/topic/20787-paid-development-2016/
https://wildfiregames.com/forum/index.php?/topic/20789-paid-development-2016/

Enable maps to restrict setting values:
* If a map specifies an AI or Civs for a playerslot, the controller
can't assign a player/other AI or Civ to that slot, refs #3049, #3013.

Fix per player StartingResources, PopulationCap, StartingTechnologies,
DisabledTechnologies, DisabledTemplates following 9177683653, refs #812,
fixes #4504. Use this for DisabledTechnologies on Polar Sea.

Persist user settings for Skirmish maps:
* All user chosen settings are persisted when changing the selected map
or maptype,
  except where the selected map overwrites the setting value and
  except for Scenario maps which still use the default value where the
map doesn't specify the setting value.

* Tickets relating to that Skirmish mapchange user setting persistance:
 - Selecting a map doesn't change the selected civilizations, fixes
#3120 (together with 7cf83f19fd removing map specified Civs).
 - Selecting a map type doesn't reset the selected settings, fixes
#5372.
 - Selecting a map doesn't change the selected victory conditions,
unless the map specifies those, refs #4661, #3209. (Atlas still writes
VictoryConditions to every map.)
 - Consume the player color palette from Skirmish maps, refs 4996d28110
/ #1580. Preserve the selected playercolors when switching the
Skirmish/Random map by chosing the most similar colors if the map comes
with a different palette.

Rated games:
* Hide and disable Rated game setting unless there are exactly two
players, fixes #3950, supersedes D2117.
* Display conspicuous warning if the game is rated, so players are
perfectly aware.

Autostarted games:
* Allow using the gamesetup page to autostart matches with arbitrary
maps, not only this one tutorial, as reported in D194 and 15e2b42525,
refs D11.

Networking:
* Keep gamesetup page open after disconnect, allowing players to read
chat messages indicating why the host stopped the server, fixes #4114.
* The message subscription system allows new and mod settings to run
custom logic on arbitrary setting changes (most importantly on map
change).
  This removes hardcoded logic restrictions from the gamesetup option
unification rewrite in b4e5858f6d/D322, refs #3994,
  such as the hardcoding of setting references in selectMap to biomes
from f2550705d3/D852 and the difficulty from 9daa7520ef/D1189,
RelicDuration, WonderDuration, LastManStanding, RegicideGarrison,
TriggerScripts, CircularMap, Garrison, DisabledTemplates.

Checkboxes:
* Display values of disabled checkboxes with Yes/No labels, fixes D2349,
reviewed by nani.

Clean g_GameAttributes of invalid values and gamesetup GUI temporaries,
refs #3049, #3883:
* Delete useless values:
 - VictoryScripts, because they are redundant with TriggerScripts,
introduced in 8915037631.
 - mapType which was written twice to g_GameAttributes following
9177683653
 - Description, Keywords, Preview since that doesn't impact simulation
and can be loaded from the MapCache
 - mapFilter, mapPath, SupportedBiomes, SupportedTriggerDifficulties
since they are only used in the gamesetup
* Delete conditional values if the condition is not met:
 - AIDiff, AIBehavior if there is no AI in that slot
 - Nomad and Size if the maptype is not Random
 - Biome, TriggerDifficulty if the map doesn't support that
 - WonderDuration, RegicideGarrison, RelicCount, RelicDuration if the
according VictoryConditions are not enabled
 - LastManStanding if TeamsLocked
 - Rating if there are more than 2 players

MapCache:
* Refactor to MapCache class, store maps of all types and use it in the
replaymenu, lobby and session as well.

SettingTabsPanel:
* Remove hardcodings and coupling of the SettingTabsPanel with
biomes/difficulties/chat UI from D1027/ac7b5ce861.

GamesetupPage.xml:
* Restructure the page to use hierarchical object organization
(topPanel, centerPanel, centerLeftPanel, bottomPanel, centerCenterPanel,
centerRightPanel, bottomLeftPanel, bottomRightPanel), allowing to
deduplicate object position margins and size math and ease navigation.

New defaults:
* Check LockedTeams default in multiplayer (not only rated games).
* Persist the rated game setting instead of defaulting to true when
restarting a match, which often lead to unintentional rated games when
rehosting.
* 60 FPS in menus since they are animated

Autocomplete sorting fixed (playernames should be completed first).
Refactoring encompasses the one proposed in Polakrity and bb D1651.

Differential Revision: https://code.wildfiregames.com/D2483
Tested by: nani
Discussed with:
* nani for blackbox testing, code architecture, performance and
MapBrowser in PMs on 2019-12-19, 2019-12-31, 2020-01-06
* Angen for the simulation diff on
http://irclogs.wildfiregames.com/2020-01/2020-01-03-QuakeNet-%230ad-dev.log
* bb on SettingsTabPanel on
http://irclogs.wildfiregames.com/2020-01/2020-01-05-QuakeNet-%230ad-dev.log
* Imarok on data model and revised multi-controller plans for #3806 on
http://irclogs.wildfiregames.com/2020-01/2020-01-07-QuakeNet-%230ad-dev.log
Emojis by: asterix, Imarok, fpre, nani, Krinkle, Stan, Angen, Freagarach
This was SVN commit r23374.
2020-01-11 20:14:17 +00:00