1
0
forked from mirrors/0ad
Commit Graph

1580 Commits

Author SHA1 Message Date
Imarok 776899c254 Show rank icon above status bars
Reviewed by: bb
Fixes: #5005
Differential Revision: https://code.wildfiregames.com/D717
This was SVN commit r21076.
2018-01-30 15:10:20 +00:00
temple 37d317e01a Remove the alert status on units
Differential Revision: https://code.wildfiregames.com/D681
Reviewed by: causative
Fixes: #4185, #4656

This was SVN commit r21074.
2018-01-30 01:47:12 +00:00
temple 1ba1e86c5e Use a countdown rather than a tooltip for displaying construction progress
Change the time to completion to a countdown and remove the tooltip on
the health bar.
Move the number of builders to the time speed-up tooltip.
Remove the build rate tooltip.

Differential Revision: https://code.wildfiregames.com/D572
Early review by: wraitii
Comments by: bb
This was SVN commit r21072.
2018-01-30 00:02:10 +00:00
elexis e185820e10 Implement TS_ASSERT_NUMBER as a future precaution of the integer epsilon slip in 30fe33bb0b.
Add another vector rotation test.

This was SVN commit r21064.
2018-01-29 11:55:43 +00:00
elexis 30fe33bb0b Add another Vector2D rotation test (illustrating the most common rmgen rotation transformation).
TS_ASSERT_EQUALS_APPROX must not silently pass if epsilon wasn't given.
Sort Vector2D.rotate summands by component rather than saving one
character.

This was SVN commit r21062.
2018-01-29 09:51:20 +00:00
mimo b611a2f4bf Make the ai aware of invulnerable entities
Commented by elexis

Differential Revision: https://code.wildfiregames.com/D1267
This was SVN commit r21048.
2018-01-28 19:53:29 +00:00
elexis de3c50adf0 Floor operation on vectors.
Useful to get the coordinates of a tile of an entity position for
instance.

This was SVN commit r21024.
2018-01-27 01:38:23 +00:00
mimo bfd6cb6e41 The gui shouldn't load again needed templates on each turn
Reviewed By: echotangoecho
Differential Revision: https://code.wildfiregames.com/D1258
This was SVN commit r21019.
2018-01-26 19:09:48 +00:00
elexis 193eff6d5b Fix AuraManager OOS on rejoin following c90d72deb5 / D1108.
The AuraManager serialized the affects array of the aura JSON files,
while the Auras components create new affects arrays upon
deserialization.
So the AuraManager of rejoined clients failed to identify and remove the
according aura effects of units who received the aura effect before the
rejoin.

Fix it by not serializing the array but only the strings inside the
array.
It were preferable to rebuild the modification cache and remove the
serialization altogether, refs #3834.

f24523dc8f introduced the same OOS on rejoin, refs #3909, #4239, but it
wasn't noticed due to the revert in d7e51f2a4f.

Differential Revision: https://code.wildfiregames.com/D1201
Reviewed By: bb
Comments By: gameboy
Fixes #4924

This was SVN commit r21014.
2018-01-25 16:45:58 +00:00
temple 680ad76249 Fix formation auras
Differential Revision: https://code.wildfiregames.com/D756
Reviewed by: mimo
Comments by: bb
This was SVN commit r21006.
2018-01-24 19:17:04 +00:00
temple b0b24a472b Move minimap color deserialization fix out of the gui
Differential Revision: https://code.wildfiregames.com/D1250
Reviewed by: elexis
This was SVN commit r21005.
2018-01-24 19:12:19 +00:00
elexis 5245e9983b Rename expectException from 1cdc8f1356 to TS_ASSERT_EXCEPTION.
Move it from the test of the testsetup to the setup of the tests, so it
can be reused by tests, refs #4759, D871.

This was SVN commit r20989.
2018-01-23 20:00:52 +00:00
mimo d8ed8b1462 Cleaning of GetEntityState part 2
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1227
This was SVN commit r20965.
2018-01-22 18:02:38 +00:00
elexis 36fba76a74 Revert unintentional function rename in 40cc3aaa09.
Don't troll OOS-debugging developers with aura ranges rendered in an
invisible color, refs 5fbb224dc0 / D555.

This was SVN commit r20961.
2018-01-22 06:02:52 +00:00
temple 2b501c9fa6 Fix formation animation warning
Differential Revision: https://code.wildfiregames.com/D998
Reviewed by: wraitii
Fixes: #3239

This was SVN commit r20956.
2018-01-22 03:00:41 +00:00
temple 7214cfc991 Add a visibility check to FindNearbyResource and FindNearestDropsite
Differential Revision: https://code.wildfiregames.com/D1161
Reviewed by: s0600204
Comments by: bb
This was SVN commit r20955.
2018-01-22 02:49:57 +00:00
temple 340cda5d57 Use obstruction rather than footprint in dock placement
Differential Revision: https://code.wildfiregames.com/D1163
Reviewed by: wraitii
Comments by: mimo, s0600204
Fixes: #4843

This was SVN commit r20954.
2018-01-22 02:34:46 +00:00
elexis d5af005a00 Expose INVALID_PLAYER to the JS simulation and use it instead of -1 for consistency with the C++ counterpart.
This was SVN commit r20953.
2018-01-22 01:02:29 +00:00
elexis 83d3e4f7a4 Fix undefined player color errorspam in Atlas after placing an entity, changing the civ and starting the simulation following 343ec21e75 / D623, refs #4643.
The commit had removed the fallback color as there is no traceable use
case.
Copy the Player color from the old to the new player entity in
ReplacePlayer before the ownership changes occur, so that it is always
initialized before read.

Refs 9329506e0d
Reported By: temple
This was SVN commit r20951.
2018-01-21 23:30:38 +00:00
temple dde855f7d5 Use correct distance for determining nearest dropsite
Use the distance to the nearest point on the dropsite's obstruction
rather than the center of the dropsite.

Differential Revision: https://code.wildfiregames.com/D1160
Reviewed by: wraitii
Comments by: bb, elexis
Fixes: #4592

This was SVN commit r20950.
2018-01-21 21:21:21 +00:00
temple 70290e8a22 Add a tile owner check in territory decay
Differential Revision: https://code.wildfiregames.com/D1225
Reviewed By: mimo
Comment By: elexis
Fixes: #4787
Refs: #4681, #4749

This was SVN commit r20949.
2018-01-21 20:01:12 +00:00
mimo 2214f206b7 Garrisoned units are lost after an upgrade towards a non garrison holder
Differential Revision: https://code.wildfiregames.com/D1228
This was SVN commit r20939.
2018-01-20 15:22:02 +00:00
mimo 1bcc70a1cc fix miraged properties in GuiInterface changes from 30f0e80dae
Differential Revision: https://code.wildfiregames.com/D1230
This was SVN commit r20938.
2018-01-20 15:09:42 +00:00
temple 033489480a Stop formation when ordered to stop
Differential Revision: https://code.wildfiregames.com/D999
Reviewed By: wraitii
Fixes #3565

This was SVN commit r20877.
2018-01-16 00:55:58 +00:00
temple 1ef2e709fe Gather near dropsite rather than current position after finishing construction
Summary:
{F316877}

Often we'll have a large group of units that we want to move to a new
location, but if we do that by having them building a dropsite, then if
the building's finished before everyone gets there, units still en route
will start gathering near their current position instead of near the new
location.

Test Plan: Agree.

Reviewers: wraitii

Reviewed By: wraitii
Subscribers: wraitii, Vulcan

Differential Revision: https://code.wildfiregames.com/D1162
This was SVN commit r20876.
2018-01-16 00:13:31 +00:00
mimo 30f0e80dae Cleanup of GetEntityState
Reviewed By: elexis
Trac Tickets: #4322

Differential Revision: https://code.wildfiregames.com/D1223
This was SVN commit r20875.
2018-01-15 21:27:30 +00:00
mimo d05655ebda fix leftover in 5df1f4ec4c
This was SVN commit r20848.
2018-01-13 09:39:43 +00:00
bb 891870a554 Stop serializing minimap playercolors
Patch By: temple
Comments By: elexis
Differential Revision: https://code.wildfiregames.com/D1124
This was SVN commit r20797.
2018-01-07 20:23:04 +00:00
mimo 2dc41277df cleanup 9daa7520ef following bb's comments
This was SVN commit r20763.
2018-01-03 15:27:02 +00:00
mimo 9daa7520ef Allows trigger script with different difficulty levels
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1189
This was SVN commit r20760.
2018-01-03 11:21:37 +00:00
elexis bc2c9c1939 JS GUI session cleanup.
Load technologies through the globalscript from D1108 / c90d72deb5
rather than querying the simulation for that.
Same can be done for auras afterwards.

This was SVN commit r20756.
2018-01-02 21:50:41 +00:00
bb c9295a0f59 Nuke missleading non-existing spearman/sword(s)man classname references.
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D1173
This was SVN commit r20746.
2018-01-01 15:06:52 +00:00
elexis c90d72deb5 Replace DataTemplateManager simulation component with a globalscript, refs #4868.
Removes the serialization of JSON files, shrinking savegame files and
rejoin states sent across the network, refs #3834, #4239, #3909,
f24523dc8f.
Removes the AI C++ code to read JSON files from e33d4a52e9 since the AI
can now use the globalscript.
Allows the AI to read Aura templates and removal of GUIInterface code to
improve performance.
Serialization of the JSON objects in other simulation components was
removed in 9c0e37f2c0 / D1109, a6f14f5631 / D1130.

Serialization removal planned by sanderd17
AI part proofread by mimo
Simulation part proofread by bb
Discussed with Itms on irc

Differential Revision: https://code.wildfiregames.com/D1108
This was SVN commit r20737.
2017-12-31 01:02:21 +00:00
elexis fd08061ab6 Allow Vectors to be rounded.
For instance useful when working with location vectors on arrays, such
as terrain generation in random map scripts, refs #4845.

This was SVN commit r20723.
2017-12-29 15:37:16 +00:00
elexis 774a049cdd Vector cleanup.
Improve some of the comments mentioned by fatherbushido in b3dbcc457b.
Rename avg to average and test it.
Inline constructor defaults.
Don't use array functions nor for...of loops here to maximize the
performance, refs c751500907.

This was SVN commit r20706.
2017-12-28 01:54:56 +00:00
elexis 58b2e2baf4 JS file listing cleanup, refs #4868.
Add global filelisting helper.
Remove getXMLFileList and getJSONFileList from the unsorted
gui/common/functions_utility.js.
Make hidden maps prefix more transparent.
Remove hardcoded magic numbers that are string lengths.
Shorten loading screen code and separate pathnames from code.

Differential Revision: https://code.wildfiregames.com/D1107
Reviewed By: bb
This was SVN commit r20692.
2017-12-26 22:44:37 +00:00
bb 350c4580f8 Create a parent template for the maceman and add a maceman identity class.
Macemans and swordsman are different, and more civs than just maur might
get them (maybe in mods), so a parent template for them is good to have.
Updating the tech so it keeps affecting the same (but notice it doesn't
do anything with macemans).

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1036
This was SVN commit r20682.
2017-12-24 16:04:10 +00:00
bb 84dd34639d Remove duplicate check in the canAttack query between unitAI and attack, also remove the forceRespond relic, which allows units to attack neutral players.
Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1099
This was SVN commit r20678.
2017-12-23 15:53:00 +00:00
wraitii 95c03dcc64 Let the template define the actor used for the projectile. Also let projectiles have an impact animation (such as an explosion).
This will enable us in the future to have technologies that change
projectiles.
This is also somewhat of a refactoring.

Patch By: Mate-86
Reviewed By: wraitii
Trac Tickets: #1909

Differential Revision: https://code.wildfiregames.com/D945
This was SVN commit r20676.
2017-12-23 09:27:19 +00:00
mimo 5df1f4ec4c add allowCapture argument to moveAttack (and patrol) commands
Discussed with elexis

Differential Revision: https://code.wildfiregames.com/D1150
This was SVN commit r20665.
2017-12-19 19:24:48 +00:00
mimo ef0b774321 cleanup VisionSharing tests
This was SVN commit r20661.
2017-12-18 17:55:25 +00:00
mimo 93b777b9fe Use Array.from intead of the spread operator (that's more readable and more performant)
Patch by elexis

Reviewed and extended by mimo

Differential Revision: https://code.wildfiregames.com/D1135
This was SVN commit r20657.
2017-12-16 16:39:28 +00:00
bb dfa66fbc12 Cleanup getNumPlayers() calls
Do not check for system components,
Do not inline in loops for performance
Use QueryPlayerIDInterface instead of querying the playerEnt

Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1137
This was SVN commit r20652.
2017-12-13 20:41:41 +00:00
bb e534f59e01 Cleanup endGameManager win/defeat messages code
Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1115
This was SVN commit r20650.
2017-12-12 22:30:20 +00:00
wraitii 8446b92f1b Update all female_citizen actors so that idle animations properly show carried resources.
By refactoring unitAI slightly, we can easily improve our support for
running/walking/idle animations.
Other gatherer entities (and other entities with custom walking
animations for certain variants) will need to be updated individually at
a later point to support this feature.

Reviewed By: bb, fatherbushido (a while ago)
Differential Revision: https://code.wildfiregames.com/D311
This was SVN commit r20631.
2017-12-10 10:06:08 +00:00
elexis 40cc3aaa09 Rename RangeVisualization component from ee5bb1fd61 / D238 to RangeOverlayManager for consistency with the RangeOverlayRenderer from 5fbb224dc0 / D555.
Refs #4899, #3915

This was SVN commit r20627.
2017-12-10 03:28:38 +00:00
s0600204 7aae697bc5 Remove civ-specific hardcoding in rmgen wall-placement script.
Original Patch By: FeXoR
Reviewed By: FeXoR
Commented On By: elexis
Refs #2944
Differential Revision: https://code.wildfiregames.com/D900
This was SVN commit r20625.
2017-12-10 03:12:54 +00:00
elexis be06299e28 Use only one getter for range overlays instead of three to four in the Heal and Auras component.
Move default Heal range visualization texture properties to the template
and only display Heal ranges if the template was given.

Differential Revision: https://code.wildfiregames.com/D1128
Refs #3915, #4349, D238, D432, D568

This was SVN commit r20624.
2017-12-10 03:08:05 +00:00
elexis 5b6ac6deda Display attack range in building previews.
Patch By: Sandarac
Taken from D555
Refs #3915

This was SVN commit r20623.
2017-12-10 02:48:29 +00:00
elexis 5fbb224dc0 Render the range visualization of auras, heal and attack component in a separate RangeOverlayRenderer component instead of abusing Selectable for that.
This also allows non-selectable entities like building previews to cast
range visualizations.

Patch By: Sandarac
Differential Revision: https://code.wildfiregames.com/D555
Refs #3915, #4349, ee5bb1fd61 / D238.
Comments By: Vladislav
This was SVN commit r20622.
2017-12-10 02:41:08 +00:00