Commit Graph

20126 Commits

Author SHA1 Message Date
Alexandermb
a1f3d9bf73 Fix warning messages mentioned by @stan
Thread:
https://wildfiregames.com/forum/index.php?/topic/26012-committed-animations-re-export-and-unit-meshes-fix/page/28/&tab=comments#comment-387360

This was SVN commit r23128.
2019-11-02 14:34:42 +00:00
Alexandermb
03e07ed0a8 Fix of variants following 80e13ea74a
This was SVN commit r23127.
2019-11-02 04:25:42 +00:00
Alexandermb
67f9f225e5 Helmets miscelaneous fix:
celt_foret.dae Rotation as requested by @stan.

hele_crest_pilos_hair_a.dae fix a wrong model in the pilos crest hair.

This was SVN commit r23126.
2019-11-02 04:22:33 +00:00
Alexandermb
2a5b53ac41 Remove unused variant.
Following 80e13ea74a

This was SVN commit r23125.
2019-11-02 03:56:55 +00:00
Alexandermb
80e13ea74a Standarize Capes for make them easier to handle.
Capes now works as blankets does for horse, capes actors no longer need
to be duplicated in order to work with a different variant actor such
swordsman or spearman, in this case capes gather together all the
availabe variants into a single actor.

Remove unused variants and rename for a better name consistency.

Remove shieldsmall animations from swordsman folder since this no longer
makes a difference on the animations.

This was SVN commit r23124.
2019-11-02 03:55:00 +00:00
wackyserious
b9956629cf Texture Update: Gallic Tunics (Basic rank)
Thread:
https://wildfiregames.com/forum/index.php?/topic/27189-task-gallic-tunic-textures/&tab=comments#comment-387337

General Discussion:
https://wildfiregames.com/forum/index.php?/topic/23002-task-celtic-unit-textures/&do=findComment&comment=366508

Reviewed by: Stan, Alexandermb, Geneva, Sundiata and several community
members.

This was SVN commit r23123.
2019-11-02 02:51:48 +00:00
Alexandermb
b6e5d691e3 Several new animations and adjusments:
10 New Animations:

* 2 Spearman
* 8 Swordsman

6 Adjusted:

* 1 Hoplite
* 5 Swordsman

Actors adjusments:

New variant applied for ptol infantry spearman
Variants assignment for the rest of actors.

This was SVN commit r23122.
2019-11-02 01:21:17 +00:00
Alexandermb
3d73816ba2 New Ptol Spearman animations:
Including:

New idles Relaxed (5).

This was SVN commit r23121.
2019-11-02 01:06:33 +00:00
wackyserious
367e60ce1a Texture Update: 1.) Ptolemaic Thureophoroi (Melee) - Elite Rank 2.) Ptolemaic Royal Agema
Thread:
https://wildfiregames.com/forum/index.php?/topic/27188-committed-ptolemaic-thureophoroi/

General Discussion:
https://wildfiregames.com/forum/index.php?/topic/22184-task-greek-unit-texture-general-thread/&do=findComment&comment=387296

Reviewed by: Stan, Alexandermb and several community members
This was SVN commit r23120.
2019-11-01 23:50:09 +00:00
wackyserious
7c21b8b056 Texture Update: Athenian Hoplite (Advanced rank)
General Discussion:
https://wildfiregames.com/forum/index.php?/topic/22184-task-greek-unit-texture-general-thread/&do=findComment&comment=386588

Reviewed by: Stan
This was SVN commit r23119.
2019-11-01 23:36:45 +00:00
7e081b555f TimeNotificationOverlay and Ambient class, refs #5387.
Notice TimeNotificationOverlay.xml must be included after
PauseOverlay.xml, otherwise there will be a Z/transparency bug, see
D148.

This was SVN commit r23117.
2019-10-30 14:39:44 +00:00
205dba32c7 Cheats GUI container class, refs #5387.
This was SVN commit r23116.
2019-10-30 14:06:27 +00:00
6b573d9249 Move session network status overlay to a separate class, refs #5387 and fix pause hotkey disabling for non-hosting observers following e3f43f6352/D2378.
This was SVN commit r23115.
2019-10-30 13:48:27 +00:00
bc6da5e3f2 SessionMessageBox class, refs #5387.
Decouples events from event handling, removes implicit-pause duplication
per messagebox and allows mods to modify message box values.

Differential Revision: https://code.wildfiregames.com/D2398
Comments By: Stan, Freagarach
This was SVN commit r23114.
2019-10-30 11:14:55 +00:00
3617689230 Fix performance improvement (50 microsec/call) valuesetting missing in 38e06fce7e/D2391, reported by Stan in 1348c936b1.
This was SVN commit r23113.
2019-10-30 10:35:36 +00:00
1348c936b1 Fix FPS/realtime/matchtime/ceasefire overlay counter visibility following 38e06fce7e/D2391 when starting with all counters disabled or starting a match with ceasefire disabled but ceasefire counter enabled, reported by Polakrity.
This was SVN commit r23112.
2019-10-29 16:28:36 +00:00
Alexandermb
f615b71c30 Remove unused variant following e1d6acf008
This was SVN commit r23110.
2019-10-28 19:08:08 +00:00
Alexandermb
a89ad97898 Rename the remaining files after 210121d09a
Art_Naming Convention
https://trac.wildfiregames.com/wiki/ArtFileNamingConventions

Remove two unused variants:

attack_melee_hoplite.xml

attack_melee_swordsman_shieldarm.xml

This was SVN commit r23109.
2019-10-28 18:53:11 +00:00
Alexandermb
20edc5e45d Remove idle_relax_long in base_spearman_shield_relax.xml variant.
This was SVN commit r23108.
2019-10-28 15:54:28 +00:00
Alexandermb
210121d09a Rename animations based on Art_Naming Convention https://trac.wildfiregames.com/wiki/ArtFileNamingConventions
Requested by @Stan

This was SVN commit r23107.
2019-10-28 15:52:35 +00:00
Alexandermb
e1d6acf008 New Celt Spearman animations:
Including:

New idles Relaxed (6).

New naming convention following Art_Naming Convention
https://trac.wildfiregames.com/wiki/ArtFileNamingConventions

Also included a fix in the attack hoplite variant.


Renaming _Gaul to _Celt since this animations gonna be used by both
factions (Gaul/Brit)

Added variant for the ptolemaic galatians

This was SVN commit r23106.
2019-10-28 15:14:10 +00:00
64bae4328e Toggle mainmenu submenus instead of opening the same submenu on repeated clicks.
This was SVN commit r23105.
2019-10-28 13:55:54 +00:00
7b9b9d5dd5 Revert session z="0" removal in 702cdbf0c7/D2292, since the value of the "default" style value for "z" is overwritten by CGUI::Xeromyces_ReadObject and since these session/ z values are necessary for correct display, refs 31a2dd294e.
This was SVN commit r23104.
2019-10-28 12:50:30 +00:00
f7161ad5c6 Support deleting GUI Object event handlers following af9c336b43, refs #5387.
Differential Revision: https://code.wildfiregames.com/D2395
Reported by: nani
Tested on: gcc 9.2.0, Jenkins/vs2015

This was SVN commit r23103.
2019-10-28 11:35:04 +00:00
Alexandermb
8061bd360f New Hoplite animations:
Including:

Replace idles Relaxed (7) (Before 8).
New idle Ready (2).
New naming convention following Art_Naming Convention
https://trac.wildfiregames.com/wiki/ArtFileNamingConventions

Also included a fix in the elephantry/turret_idle.xml variant.

This was SVN commit r23101.
2019-10-27 15:54:14 +00:00
Alexandermb
fa01d4ff32 Fix warnings mentioned by @stan in this thread:
https://wildfiregames.com/forum/index.php?/topic/26012-committed-animations-re-export-and-unit-meshes-fix/page/26/&tab=comments#comment-387068

This was SVN commit r23100.
2019-10-27 15:20:51 +00:00
Alexandermb
7dc64ecf9f New pikeman animations:
Including:

* New idles Relaxed (7).
* New idle Ready (1).
* New Attacking Animations (3) as well as improvement of the first one.
* New naming convention following Art_Naming Convention
https://trac.wildfiregames.com/wiki/ArtFileNamingConventions

Thread:
https://wildfiregames.com/forum/index.php?/topic/26012-committed-animations-re-export-and-unit-meshes-fix/page/26/&tab=comments#comment-387021

This was SVN commit r23099.
2019-10-27 14:34:29 +00:00
ece4a323eb Fix wrong playerID used for the controlAll developer overlay option in 96a6a136b6/D2383.
Reported By: Freagarach
This was SVN commit r23098.
2019-10-27 14:15:56 +00:00
3aa4ac7b00 Fix Atlas complaining again, this time for the objectives dialog from e3f43f6352, refs 966b1608da.
The atlas check added in e3f43f6352 works for skirmish maps but not for
random maps generated in Atlas.
The same atlas check added in f2778ea7b4 works for random maps since the
partial information Atlas provides happened to be sufficient for
DiplomacyPlayerText.

Reported by Stan in 6814a983e1.

This was SVN commit r23097.
2019-10-27 13:40:11 +00:00
38e06fce7e Rewrite FPS/Realtime/Gametime/Ceasefire counters to use object semantics using class notation, refs #5387.
Rebuild the counters every 250ms instead of every frame and minimize
object creation.

Differential Revision: https://code.wildfiregames.com/D2391
Comments By: Stan
This was SVN commit r23096.
2019-10-27 12:39:28 +00:00
abe2ec9c75 deleting broken template that slipped through
This was SVN commit r23095.
2019-10-27 08:52:41 +00:00
21106e011f Artillery tower master commit, Keep your eyes open for errors, everything's good on my end but my subversion is filthy
This was SVN commit r23094.
2019-10-26 16:42:35 +00:00
0ce0340bf5 Small mainmenu style cleaup following adf448db4d/D2240, refs #5387.
Add class MainMenuPage, BackgroundLayer, remove duplication of XML size
values in the MainMenuItemHandler,
remove onTick assignment from XML, replace references to globals with
local references.

Differential Revision: https://code.wildfiregames.com/D2390
Comments By: Stan
This was SVN commit r23093.
2019-10-26 13:30:26 +00:00
Alexandermb
8b17110dfc New gaul idles for swordsman and new pikeman attacking animations.
This was SVN commit r23092.
2019-10-25 13:23:12 +00:00
3fc18b9be3 Make options page agnostic of session page and implement RangeOverlayManager GUI class, refs #5387, #4747.
Avoids further session commits that missed to keep options.json session
code in sync,
enables use of anonymous or object owned config callback handlers and
encourages session developers to make the GUI more reactive to changing
options.

Update RangeOverlays when reseting to default, and update
RangeOverlays of selected entities upon closing the page too (not only
hotkey).

Differential Revision: https://code.wildfiregames.com/D2389
This was SVN commit r23091.
2019-10-25 11:56:20 +00:00
b859195064 Decouple panel entities code from session code and use class notation, refs #5387, #3000, #1902, #1802, d7d1d8ccb5.
Change the logic to only insert/delete buttonhandlers on ownershipchange
and update only the entitystate dependent part on simulation update.

Differential Revision: https://code.wildfiregames.com/D2387
This was SVN commit r23089.
2019-10-22 17:53:22 +00:00
688a2a00a8 Move researched tech progress overlay to a separate file, use class notation, refs #5387.
Improves performance if no techs are researched from 200 to 50
microseconds per turn (from 500 to 300 microseconds for one tech etc).

Differential Revision: https://code.wildfiregames.com/D2386
This was SVN commit r23088.
2019-10-21 23:05:04 +00:00
ba993d4610 Refactor session lobby bot client code to use object orientation, refs #5387.
Adapt rating score for exploration score and add comment to keep
calculateExplorationScore and calculateScoreTotal in sync following
be881dc420 (following the formula in a4f27dc3e0 and bffe917914 being
otherwise in sync with the summary screen measures), refs #686.
Adapt rating score for captured entities and add comment to keep
calculateMilitaryScore in sync following f60befe098, refs #3216,
ad27deeb9d.
Adapt rating score for trade and vegetarian food and add comment to keep
calculateEconomyScore in sync following 202e567492/D494 and
215a102c27/D1052, refs #3948.
Remove ceasefire sending from the client from d21c0026ec since the bot
doesn't record it and since ceasefire time is expected to be 0 after a
1v1 was decided, refs #2749.
Resolve column value computation fragmentation and remove unneeded
intermediary object encoding following 1d3ac14d35, refs #686.
Remove hardcoding/duplication of unit and structure classes and send
domesticUnitsTrained too, refs c7a04e219b/D2384.
Move session code including the two globals to a separate folder so as
to maximize separation of and ease distribution without lobby code.
Migrate useless ugly trailing commas from bffe917914, to be removed in a
patch modifying the bot code.

Differential Revision: https://code.wildfiregames.com/D2385
This was SVN commit r23087.
2019-10-21 15:00:59 +00:00
c7a04e219b Remove hardcoding and quadruplication of the StatisticsTracker unit and building classes following 1d3ac14d35, refs #686.
Amongst other issues encountered in the lobby ranking session statistics
reporting, refs #5387, D2385, bffe917914.
Correct test case from 59e7320a49/D1305.

Differential Revision: https://code.wildfiregames.com/D2384
Comments By: Freagarach
This was SVN commit r23086.
2019-10-21 08:48:17 +00:00
3791748a32 New Elm trees.
Art by: @BigTiger
Reviewed and adapted by: @Stan
This was SVN commit r23085.
2019-10-21 06:36:16 +00:00
cf64aa4304 New lavender actors.
Thread:
https://wildfiregames.com/forum/index.php?/topic/25431-task-trees/page/13/

This was SVN commit r23084.
2019-10-20 20:52:34 +00:00
6ca05322e0 Rephrase the tooltip of Reload Cache to avoid confusion
Summary: The action is Reload Cache, but the tooltip used to say Rebuild
instead of Reload, which caused some confusion among translators
(https://www.transifex.com/wildfire-games/0ad/translate/#sv/$/113848525),
and hence could have the same effect among users.

Test Plan: No tests, only user-visible strings are affected.

Reviewers: Imarok

Reviewed By: Imarok
Differential Revision: https://code.wildfiregames.com/D2294
This was SVN commit r23083.
2019-10-20 11:20:44 +00:00
a0d6bd8e91 list heroes after champions and correct some structure tooltips
Summary: This patch lists heroes after champions in structure production
queues and corrects some structure tooltips.

Test Plan: Check for mistakes and omissions.

Reviewers: Gallaecio

Reviewed By: Gallaecio
Subscribers: Freagarach, wraitii

Differential Revision: https://code.wildfiregames.com/D2324
This was SVN commit r23082.
2019-10-20 10:57:26 +00:00
96a6a136b6 Rewrite developer overlay to use class syntax, one class per checkbox, a class for the EntityState overlay and TimeWarp debug feature, refs #5387.
Using 22 classes instead of 1 class (refs 2bcf4f678b/D1928) leverages
more benefit of the paradigm.
In particular it means the checkboxes can own the EntityState and
TimeWarp helpers and the DeveloperOverlay itself can remain independent.
Improve performance by 200 microseconds per turn by unsubscribing from
onSimulationUpdate when the developer overlay is not opened, refs
e3f43f6352 / D2378.
Move TimeWarp from input.js from 8ddef2fee0 to independent class using
hotkey release event from 78bc56f33e, refs #3194.

Differential Revision: https://code.wildfiregames.com/D2383
This was SVN commit r23081.
2019-10-19 00:26:34 +00:00
6ec5855136 Rewrite session menu code to use object orientation, finish off menu.js, refs #5387, adf448db4d / D2240.
Add tooltips for buttons that can be triggered with hotkeys.
Unassign menu animation onTick function after the animation finished,
refs 9a00398e24.
Cleans unused openMenu following 5aae5ee55a.

Differential Revision: https://code.wildfiregames.com/D2380
This was SVN commit r23080.
2019-10-18 14:11:43 +00:00
Alexandermb
0f581e4398 Prepare some animations for the upcoming new shields "Roman Scutum".
Add a new ready variant animations.

This was SVN commit r23079.
2019-10-18 04:00:26 +00:00
Alexandermb
3899c9c7d2 Fix broken camel animations.
This was SVN commit r23078.
2019-10-17 17:40:24 +00:00
fbe57d2066 Commit files missing in previous commit e3f43f6352 / D2378.
This was SVN commit r23077.
2019-10-17 15:22:18 +00:00
e3f43f6352 Implement session event subscription system and rewrite TopPanel, PlayerViewControl, GameSpeed, Pausing, ObjectivesDialog to use object orientation, refs #5387.
New controller classes: PlayerViewControl, PauseControl,
GameSpeedControl
New viewer classes: ObjectivesDialog, PauseOverlay, FollowPlayer,
TopPanel (BuildLabel, CivIcon, CounterManager, CounterPopulation,
CounterResource refs 7e14a33411/D1113, GameSpeedButton,
ObjectivesDialogButton)

New events: SimulationUpdate, EntitySelectionChange, ViewedPlayerChange,
PreViewedPlayerChangeHandler, PlayerIDChange, PlayersInit,
PlayersFinished, Pause, DiplomacyColorsChange, HotkeyChange, refs #2604
Improves GUI onSimuationUpdate performance without selected entities by
allegedly 30%.

Delete misleading dead code resign command from leaveGame and rename to
endGame. The command is not sent via network (see fa85527baf) nor
processed in simulation, because the Game instance is deleted
immediately thereafter, introduced in fcedcae052, refs a3e1c68b9a,
39ffb0a6bd, 9f796068f8.
Remove explicitResume 0 value from e57c99c6f6 and 8ae67ed15f which
should have been a false if defined, and is equivalent to the default.
Restore fast forwarding option from cd571035bb/D595 for developers
changing the perspective to observer or player following 56308ec1ad.
Add pausing for the delete dialog missing following 7a7ebaa983.

Differential Revision: https://code.wildfiregames.com/D2378
This was SVN commit r23076.
2019-10-17 15:08:56 +00:00
Alexandermb
ed11b3f039 Some tweak to animation in the 2nd swordsman shield attack
This was SVN commit r23075.
2019-10-17 04:22:57 +00:00