Commit graph

20186 commits

Author SHA1 Message Date
Stan
53d00a63bb Fix boar running animation broken in 9229ed6c42
Patch by: @Vido
This was SVN commit r23206.
2019-12-05 12:10:34 +00:00
Angen
f1b07b2ff4 Remove forgot return from refactoring in 8446b92f1b
This was SVN commit r23205.
2019-12-04 18:42:01 +00:00
Stan
9119728bfc Fix boar walking animation broken in 9229ed6c42
Patch by: @Vido
This was SVN commit r23204.
2019-12-04 11:25:11 +00:00
Alexandermb
e9179f0df8 Fix latest warnings mentioned by @Stan with checkref
This was SVN commit r23202.
2019-11-29 13:45:07 +00:00
Alexandermb
f4fe197d04 Ops this didn't belong here.
This was SVN commit r23200.
2019-11-29 03:00:50 +00:00
Alexandermb
5f5f0af6f4 Sync horse trader death.
Fix Concern raised in P23195

Cart helmets not committed before.

This was SVN commit r23199.
2019-11-29 01:57:59 +00:00
Alexandermb
3b7b04d001 Replace "horse_base" with "base"
Avoiding redundance with name since folder already represents the whole
horse props

This was SVN commit r23198.
2019-11-28 22:16:26 +00:00
Alexandermb
0c7c70c5b9 Remove an empty space on some capes.
Standarize pers neckguard for work with all cavalry variants.

Fix a wrong variant in persian cavalry archer

Fix a wrong animation in archer variants.

This was SVN commit r23197.
2019-11-28 22:14:19 +00:00
Alexandermb
b984590095 Remove Unused Capes
Following 61b8a32ad5

This was SVN commit r23196.
2019-11-28 21:51:56 +00:00
Alexandermb
61b8a32ad5 Horse actors and variants cleaning.
New animations:

New Walking animation.
New Death animation.
New Attacking animation.
New Idle animation.
New Promotion animation.
New riders animations.

Remove unnecesary duplicated files.

Standarize capes for easier usage.

This patch allows horses to use multiple walking animations whitout
duplicating props such hair or blankets.

This was SVN commit r23195.
2019-11-28 21:38:21 +00:00
elexis
1453c51cb6 Fix warning about attempted empty batch train occurring if g_BatchTrainingEntityAllowedCount % batchedSize == 0, refs #1432, #4059, 7e21db08d5, 2735494a92, 2e3ac4cf20, fixes #5602, reported by nani, reproduced by faction02.
This was SVN commit r23192.
2019-11-25 20:59:21 +00:00
elexis
5d2c20beb0 Replace boost::unordered_map, boost::unordered_set with std::unordered_map, std::unordered_set to establish consistency.
Replace boost::hash_combine with a lib/hash.h hash_combine performing
the same statement.
Replace inconspicuous global boost hash_value specializations with
std::hash specializations.
No performance difference was observed in three simple MeshManager
measurements.

Remove unused TAG_MASK and h_tag in h_mgr.cpp following 0748c5a75e.
Replace typedef with using keyword and sort header includes.

Differential Revision: https://code.wildfiregames.com/D2441
Tested on: clang  9.0.0, gcc 9.2.0, Jenkins/vs2015, Jenkins/gcc6

This was SVN commit r23191.
2019-11-25 14:30:25 +00:00
Stan
acbfd21992 Remove cape redundant props.
Authored by: @Angen
Reviewed by: @Stan
Differential Revision: https://code.wildfiregames.com/D2434
This was SVN commit r23187.
2019-11-24 16:37:37 +00:00
Stan
ec12025304 Add an orange firefly particle actor.
This was SVN commit r23186.
2019-11-24 16:31:11 +00:00
Stan
9230c107c5 Allow artists to add upgrade animations.
Reviewed by: @Angen
Differential Revision: https://code.wildfiregames.com/D2371
This was SVN commit r23185.
2019-11-24 11:34:57 +00:00
elexis
52f282a7e1 Move CGUI constructor to the top of its file following 5cc814759f.
Move object type definitions to own file, since CGUI doesn't use the
GUIObject types otherwise and for similarity with GUISettingTypes,
making it slightly easier to maintain and read.

Differential Revision: https://code.wildfiregames.com/D2439
Tested on: clang 9.0.0, Jenkins/vs2015, Jenkins/gcc6

This was SVN commit r23184.
2019-11-24 10:26:48 +00:00
LordGood
427b975fdf Simplified double tower garrison classes with Freagarach's suggestion
This was SVN commit r23183.
2019-11-24 09:21:17 +00:00
elexis
c8a00adfd2 Add Balancing credits, refs #5444.
This allows merging community balancing patches without giving them
false or no credit.

Differential Revision: https://code.wildfiregames.com/D2436
Comments By: Stan
This was SVN commit r23182.
2019-11-23 15:45:12 +00:00
elexis
da4c733c8c Add some missing historic credits, refs #5444.
Excerpt from Differential Revision https://code.wildfiregames.com/D2436
Comments By: Stan
This was SVN commit r23181.
2019-11-23 15:37:31 +00:00
elexis
4ff0320980 Split credits for "miscellaneous" categories into a Community and a History credits sections.
Use whitespace in accordance with global CodingConventions for these
files while at it.

This was SVN commit r23180.
2019-11-23 15:02:43 +00:00
LordGood
14bd613288 Amphitheater name fix, Gladiator commit and amphitheater integration, Maurya double towers, ptolemaic sentry tower actor update
maurya towers
https://wildfiregames.com/forum/index.php?/topic/27156-artillery-towers/page/2/&tab=comments#comment-388537

This was SVN commit r23179.
2019-11-23 13:26:05 +00:00
Stan
89f6205d94 Rename a dds file to use the proper extension.
Noticed by: @linkmauve when trying to compress the textures to save
space.

This was SVN commit r23178.
2019-11-23 10:03:14 +00:00
Gallaecio
f7c639a79e remove "Goods" from trade window stings
Summary: Resources should be referred to as “Resources”, not as “Goods”.
This patch updates the Barter & Trade window to reflect that.

Test Plan: Check for mistakes and omissions.

Reviewers: O8 JS GUI, Gallaecio

Reviewed By: Gallaecio
Subscribers: elexis, Krinkle, bb, O8 JS GUI

Differential Revision: https://code.wildfiregames.com/D2306
This was SVN commit r23177.
2019-11-23 08:26:05 +00:00
Gallaecio
3968760129 Single Player → single-player
Summary:
Single-player is proper English, single player and singleplayer are less
correct.
(Contrary to multiplayer, which doesn't have a hyphen or space.)

Test Plan: Check for mistakes and omissions.

Reviewers: Gallaecio

Reviewed By: Gallaecio
Subscribers: Freagarach, elexis, O8 JS GUI

Differential Revision: https://code.wildfiregames.com/D2312
This was SVN commit r23176.
2019-11-23 08:10:36 +00:00
elexis
27a949a1ea Rename Lobby.js to LobbyHandler.js to avoid filename conflict with lobby.js on case insensitive filesystems/APIs following 2cccd9825d/D2412, reported by Stan.
This was SVN commit r23173.
2019-11-21 18:22:37 +00:00
elexis
2cccd9825d Rewrite lobby page to use class semantics, add more gamedetails labels, improve performance using batch processing and caching and gain possibility for game creation/player-join/leave events, refs #5387.
Game selection details features:
* Display victory conditions following their sending but missing display
following bffe917914, refs 7b0f6f530c.
* Display the host of the match and the game name in the selected game
details following 61261d14fc, refs D1666.
* Display mods if the mods differ (without having to attempt to join the
game prior) following eca956a513.

Performance features:
* Implement batch message processing in the XmppClient to rebuild GUI
objects only once when receiving backlog or returning from a match.
* Implement Game class to cache gamelist, filter and sorting values, as
they rarely change but are accessed often.
* Cache sprintf objects.

Security fixes:
* Add escapeText in lobby/ to avoid players breaking the lobby for every
participant, supersedes D720, comments by bb.
* Do not hide broadcasted unrecognized chat commands that mods used as
leaking private channels, fixes #5615.

Defect fixes:
* Fix XmppClient.cpp storing unused historic message types resulting in
memory waste and unintentional replay of for instance
disconnect/announcements messages following both e8dfde9ba6/D819 and
6bf74902a7/D2265, refs #3306.
* Fix XmppClient.cpp victoryCondition -> victoryConditions gamesetup.js
change from 6d54ab4c1f/D1240.
* Fix leaderboard/profile page cancel hotkey closing the lobby dialog as
well and removes cancel hotkey note from lobby_panels.xml from
960f2d7c31/D817 since the described issue was fixed by f9b529f2fb/D1701.
* Fix lobby playing menu sound in a running game after having closed the
lobby dialog following introduction in 960f2d7c31/D817.
* Fix GUI on nick change by updating g_Username.
* Update profile panel only with data matching the player requested.

Hack erasure:
* Object semantics make it cheap to add state and cache values, storing
literals in properties while removing globals, adding events while
decoupling components and gaining moddability.
* Erase comments and translation comments stating that this would be
IRC!!, supersedes D1136.
* Introduce Status chat message type to supersede "/special" chat
command + "isSpecial" property from bffe917914 (formerly g_specialKey
e6840f5fca) deluxe hack.
* Introduce System chat message type to supersede system errors
disguising as chat from a mock user called "system".

Code cleanups:
* Move code from XML to JS.
* Move size values from JS to XML, especially following 960f2d7c31/D817
and 7752219cef/D1051.
* Rename "user" to "player".
* Fix lobby/ eslint warnings, refs D2261.
* Remove message.nick emptiness check from 0940db3fc0/D835, since
XEP-0045 dictates that it is non-empty.
* Add translated string for deleted subjects.
* Add TODOs for some evident COList issues, refs #5638.

Differential Revision: https://code.wildfiregames.com/D2412
This was SVN commit r23172.
2019-11-21 13:44:41 +00:00
Stan
d9e34fc88e Fix c26d36c65c
This was SVN commit r23171.
2019-11-20 19:53:51 +00:00
Stan
c26d36c65c Remove bow from praise animation and display helmets as for other gather animations
Patch by: @Angen
Differential Revision: https://code.wildfiregames.com/D2435
This was SVN commit r23170.
2019-11-20 19:40:05 +00:00
Alexandermb
9b07c6bf44 Fix Carnyx mesh folder on actors
This was SVN commit r23169.
2019-11-20 17:44:44 +00:00
Stan
075bcd0ce4 Fix Carthaginian polybolos not shooting fire projectiles. Also fix another variant.
Patch by: @Angen
Reviewed by: @Stan
Differential Revision: https://code.wildfiregames.com/D2433
This was SVN commit r23168.
2019-11-20 13:18:36 +00:00
Alexandermb
5b17a3573a Celtic Carnyx + some animations.
This was SVN commit r23167.
2019-11-18 19:44:39 +00:00
Alexandermb
af41aa3e06 Gladiator Helmets
Hoplomacus.
Murmillo.
Secutor.

This was SVN commit r23166.
2019-11-18 19:20:24 +00:00
Alexandermb
3c25bc6c54 Archers animation adjusment on attack_ranged
Replaced bow armature to avoid possible bugs with any other new armature
in future.

This was SVN commit r23165.
2019-11-18 19:16:47 +00:00
Alexandermb
60f71cd7f2 Move leg positions on elephant idles to give a more natural look.
This was SVN commit r23164.
2019-11-18 19:01:18 +00:00
Alexandermb
2837d48878 Replace asian elephants on carthaginian units by African Forest as discussed in the thread: https://wildfiregames.com/forum/index.php?/topic/26967-something-on-elephants/&tab=comments#comment-384561
This was SVN commit r23163.
2019-11-18 18:25:27 +00:00
LordGood
e96af27463 lol let a mod file slip through again
This was SVN commit r23161.
2019-11-18 05:53:47 +00:00
LordGood
d4db7d2e0b Bolt tower and ampitheater commit, updated ptolemaic sentry tower while I was at it, and radiant flame texture added for directionless fire effects, babylonian tower template switched to persian denomination for potential upgradeability
https://wildfiregames.com/forum/index.php?/topic/27156-artillery-towers/page/2/&tab=comments#comment-388362
https://wildfiregames.com/forum/index.php?/topic/27230-pompeii-ampitheater/&tab=comments#comment-387990

This was SVN commit r23160.
2019-11-18 01:12:41 +00:00
LordGood
e0393304c2 Give the Macedonian defense towers the ability to upgrade into artillery towers
This was SVN commit r23159.
2019-11-16 17:25:26 +00:00
elexis
5a691463a3 Update sprintf.js library from 1.0.2 to 1.1.2.
Includes a changeset that removes a SpiderMonkey segfault from occurring
(when passing an XmppClient JS::Heap or JS::PersistentRooted GUIMessage
following 9023f4bebb), refs #5636.
https://bugzilla.mozilla.org/show_bug.cgi?id=1234425
https://bugzilla.mozilla.org/show_bug.cgi?id=1238475
61c7956242

sprintf.js commits that add new features:

padding (intent) support:
9e846915e2

Adds support for the %g placeholder
g — yields a float as is; see notes on precision above
a60a5705fc

Adds type option
T — yields the type of the argument1
c31c24ecef

Adds support for the %t (boolean) type specifier
t — yields true or false
b92b530c7a

Adds support for returning primitive values through the %v specifier
v — yields the primitive value of the specified argument
f18037240b

The other commits clean sprintf internals and do not change the existing
formats, see:
https://github.com/alexei/sprintf.js/blob/1.0.2/src/sprintf.js
https://github.com/alexei/sprintf.js/blob/1.1.2/src/sprintf.js
https://github.com/alexei/sprintf.js/blob/1.1.2/README.md

Differential Revision: https://code.wildfiregames.com/D2421
Tested by: Angen
This was SVN commit r23157.
2019-11-14 13:00:35 +00:00
Alexandermb
9809598224 Remove ready variant from infantry_spearman_e.xml of the roman faction.
This was SVN commit r23156.
2019-11-13 22:54:45 +00:00
Stan
23f31aa1fe Show helmets when doing citizen duty as it sometimes confused players. Remove unused baskets, and show helmets. Also hide bows.
Discussed with: @Lordgood @Alexandermb
Authored by: @Angen
Differential Revision: https://code.wildfiregames.com/D1959
This was SVN commit r23155.
2019-11-13 21:57:19 +00:00
Stan
b1f25e2879 Fix typo in particle actor.
This was SVN commit r23154.
2019-11-13 07:25:14 +00:00
Alexandermb
a536cbac9e Additional attack_ranged variants for capes whitout projectiles props avoiding unnecesary draw calls.
This was SVN commit r23152.
2019-11-13 03:15:56 +00:00
elexis
92cbcf85e5 Rename CProgressBar numeric "caption" setting to "progress" to distinguish it from the Button, Input, Text and Tooltip "caption" setting values that are tag-formatted texts.
Remove TODO question from c4684effb6 since the class updates correctly.

Differential Revision: https://code.wildfiregames.com/D2419
Tested on: clang 9.0.0, Jenkins/gcc6, Jenkins/vs2015

This was SVN commit r23151.
2019-11-12 16:53:19 +00:00
elexis
c16eddaedc Rewrite loading screen to use class semantics, refs #5387.
Add config option to display the loading screen stage description.
Add tip functions for future use, refs D1730.
Harmonize coordinates.

Differential Revision: https://code.wildfiregames.com/D2418
This was SVN commit r23150.
2019-11-12 15:54:09 +00:00
elexis
235e238f9d Fix 34ce0f865d resetting the cursor after calling the GUI pages script "init" function, refs #539.
Reset the cursor everytime the GUI page is opened, therefore also when
hotloading.

The init function shall be able to determine a cursor, such as already
present in the loading screen.

Differential Revision: https://code.wildfiregames.com/D2417
Tested on: clang 9.0.0, Jenkins/gcc6, Jenkins/vs2015

This was SVN commit r23149.
2019-11-12 14:43:58 +00:00
Alexandermb
aca8b9fffc Small typo on the recent committ
Following: 2531c22b73

This was SVN commit r23148.
2019-11-12 00:19:05 +00:00
Alexandermb
2531c22b73 Remove props from cape variants by adding cape specific variants.
Following: 80e13ea74a

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

This was SVN commit r23147.
2019-11-12 00:15:23 +00:00
LordGood
20df0a8b54 Broke a thing, tweaked artillery tower projectile gravity
This was SVN commit r23146.
2019-11-11 16:03:31 +00:00
Stan
22f659b66e Improved particle effects for the artillery towers. New shrapnel texture by Lordgood
Reviewed by: @Lordgood
Thread:
https://wildfiregames.com/forum/index.php?/topic/27223-task-improve-artillery-tower-particles/

This was SVN commit r23145.
2019-11-11 15:03:52 +00:00