Commit graph

20204 commits

Author SHA1 Message Date
Angen
a7b7486dea Set correct animation variant for formation member when starts to move
Formation variants for members are not set correctly once they move
because their ranks changes but variants do not get updated.

This was SVN commit r23233.
2019-12-14 10:10:26 +00:00
Alexandermb
67a17a7a9d Fix healer "healing_m.dae" animation being unsync first and last frame.
Reported by @elexis in ca901415c7

This was SVN commit r23232.
2019-12-13 14:36:18 +00:00
vladislavbelov
df329d1b81 Optimise out of frustum rendering of texture overlays.
Reviewed By: wraitii
Commented By: Stan
Differential Revision: https://code.wildfiregames.com/D1847
This was SVN commit r23229.
2019-12-10 23:13:37 +00:00
vladislavbelov
6110d108c1 Removes hard-coded clip planes from water shader.
Differential Revision: https://code.wildfiregames.com/D2443
This was SVN commit r23228.
2019-12-10 21:39:09 +00:00
Stan
9391756294 Add a more explicit message when requested animation rig does not match rigged model.
Reviewed By: @Angen
Discussed With: @Alexandermb

Differential Revision: https://code.wildfiregames.com/D2447
This was SVN commit r23225.
2019-12-08 19:50:36 +00:00
Stan
2b9e125ee5 Fix missing arrow on top of the action-remove-guard.png icon.
This was SVN commit r23224.
2019-12-08 19:04:35 +00:00
Angen
3a79451638 ComputeMotionParameters correctly when formation member is added or removed
As noticed by @bb in
https://code.wildfiregames.com/D1727?id=7276#inline-38148 and found
issue in 4ee4f16793#inline-4563 ComputeMotionParameters is not called
correctly.

One problem is when merging twinformations, addMembers does not update
speed, so if one formation contains slowest unit and it is merged to
formation which does not, merged formation will move faster than it
should, the same problem applies if unit is added calling function from
outside of component.

Another problem is when from formation is removed slowest unit and has
rearrange set to false. Having speed computation after rearrange check
means formation is not going to move faster if slowest member is removed
by player or killed (but it will if player recreates formation manually)

Differential Revision: https://code.wildfiregames.com/D2449
This was SVN commit r23223.
2019-12-08 13:59:33 +00:00
Angen
4b8c82bbcb Allow to play different sound when building new structure and when repairing existing structure
Entities have different sound entries for build and repair orders in
templates but currently only one is used.
This patch is using build order for foundations and repair order for
anything else.
Also playing correctly order_build when placing new construction.

Differential Revision: https://code.wildfiregames.com/D2276
Fixes: #5374
Reviewed by: @Freagarach
This was SVN commit r23221.
2019-12-07 18:42:26 +00:00
Angen
0fa06de9b6 Refactor ColorActivateFastImpl function
Refactor function from 6fbce9c355, making it shorter, cleaner and easier
to read.


Differential Revision: https://code.wildfiregames.com/D2415
This was SVN commit r23220.
2019-12-07 18:17:08 +00:00
Angen
f4562b87b6 Remove duplication of code from WaterManager
Use already defined function ReloadWaterNormalTextures with the same
code.
Fixes the TODO from 2d7d5b446d / aab15123f1

Differential Revision: https://code.wildfiregames.com/D2413
Reviewed By: @vladislavbelov
This was SVN commit r23219.
2019-12-07 15:32:47 +00:00
Angen
51bdba7045 Show progress bar when upgrading entities
9230c107c5 allows to apply animations on entity which is upgrading. This
is adding progress bar for upgrading entities.
Suggested by @wowgetoffyourcellphone in D2371#101856

Patch by: @Freagarach
Differentail Revision: https://code.wildfiregames.com/D2442

This was SVN commit r23218.
2019-12-07 13:40:40 +00:00
Angen
86acba17f0 Fix formation-walking infinite loop introduced in b807c39e6a
b807c39e6a Introduced a infinite loop in which formation members keep
receiving the order to formation walk to their proper position. This was
due to this.formationOffset is not deleted when member gets in offset
position, what means he recieved motion update and it was not because of
failure.

Patch by: @Freagarach
Differential Revision: https://code.wildfiregames.com/D2424
This was SVN commit r23217.
2019-12-07 13:21:08 +00:00
Angen
b10b193020 Fix idle unit not attacking nearest unit.
In 945d1ba2e6 checking for new targets have been moved to timer to be
executed in next turn, but los range updates were not changed, that
introduced side-effect, that was overlooked.
If unit in IDLE gets los range update, so potential target enters its
range, it will try to attack it. It is ok, if unit took into account all
units around before that, what in case timer have not been executed yet,
did not happen.

Fixing issue by introducing checks for unit being really idle.

Reported on forum:
https://wildfiregames.com/forum/index.php?/topic/27214-borg-expansion-pack-mod-implementation-in-0ad-alpha-24-release/&do=findComment&comment=387987

Patch by: @Freagarach
Differential Revision: https://code.wildfiregames.com/D2422
This was SVN commit r23216.
2019-12-07 13:01:42 +00:00
Stan
aef0c3c13a Move Ogre3D GLSL Preprocessor to a third_party folder and restore its original name. Also restore the Wrapper name to reflect what it's wrapping and move it to renderer.
Reviewed by: @Angen
Comments by: @elexis
Differential Revision: https://code.wildfiregames.com/D2338
This was SVN commit r23215.
2019-12-07 11:48:03 +00:00
Itms
57abe7a644 Fix the Atlas build in the Windows autobuilder pipeline, refs #5574.
Use the opportunity to fix some whitespace and to make the file name
consistent with Jenkins.

Patch by: Angen
Differential Revision: https://code.wildfiregames.com/D2021
This was SVN commit r23213.
2019-12-07 08:54:32 +00:00
Alexandermb
c11fc6c0fc Add a missing group tag in ptolemies/camelry_archer_b_m.xml
Mentioned by @angen on 1fd64f0712

This was SVN commit r23210.
2019-12-06 19:28:47 +00:00
Alexandermb
1fd64f0712 Fix incorrect variant on camels based on the reports of 61b8a32ad5 Unrelated but mentioned there.
This was SVN commit r23209.
2019-12-06 18:04:13 +00:00
Angen
a3941e8cca Fix UnitmotionFlying and implement CMessageMotionUpdate::FromJSVal
In 32e8ed51aa have been changed message from MotionChanged to
MotionUpdate and CMessageMotionUpdate::FromJSVal was not implemented to
reflect changes in message structure.
As a result UnitMotionFlying tries to send MotionChanged message which
not only was renamed, but sending it from js is not supported anymore.
Also reported at this thread:
https://wildfiregames.com/forum/index.php?/topic/27294-cheats-error/

Differential Revision: https://code.wildfiregames.com/D2450
Tested by: @gameboy
Tested on: Jenkins/vs2015, Jenkins/gcc6
Fixes: #5626

This was SVN commit r23208.
2019-12-06 17:36:25 +00:00
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