1
0
forked from 0ad/0ad
Commit Graph

17996 Commits

Author SHA1 Message Date
89e339dd16 Remove VFS cache, because it is less effective and less efficient than the OS cache (and partially redundant with higher level application caches).
Patch By: Sandarac
Discussed with: Philip, echotangoecho, Bezerra
Fixes #4072.
Differential Revision: https://code.wildfiregames.com/D587
This was SVN commit r20639.
2017-12-10 17:33:03 +00:00
3bfe10f63f Cleopatra anims cleanup.
Use the other prop point for the bow so animation is correct
Fix the broken quiver uncommited.
Remove one set of earings

This was SVN commit r20638.
2017-12-10 16:58:51 +00:00
71121b8a89 Define, document, validate and test validation of the format of mod.json files.
The mod "name" may only consist of alphanumeric characters, underscore
and dash, because it should be used for mod dependency checks.
Drop two special characters from the "version" property.

Differential Revision: https://code.wildfiregames.com/D1093
Res #4427, d3ce5289b6
Reviewed By: Itms
This was SVN commit r20637.
2017-12-10 16:13:18 +00:00
a82175b580 Use premake5 during automated testing, after a few weeks of use in production.
Refs #4846.

This was SVN commit r20635.
2017-12-10 14:26:53 +00:00
38d11a6fce Long range pathfinder cleanup
Remove ACCEPT_DIAGONAL_GAPS as it was unused and will not be used in the
future.
Use PASSABLE macro everywhere.
Simplify considerable OnTheWay as MakeGoalReachable returns a point
goal.

This doubles as a very slight optimisation, on the order of microseconds
per call.

Reviewed By: temple
Differential Revision: https://code.wildfiregames.com/D80
This was SVN commit r20634.
2017-12-10 14:23:16 +00:00
18b2906a9c Refactor the cxxtest premake module.
Properly fix the current issues with pre-build commands, improve the
documentation of known issues and re-design the module so it is easy to
extend it into a fully-fledged CxxTest module supporting all features of
the tool.

Reviewed By: wraitii
Tested By: elexis, bb, Imarok
Differential Revision: https://code.wildfiregames.com/D1092
This was SVN commit r20633.
2017-12-10 11:17:43 +00:00
b4a19bc44e Fix 8446b92f1b, where I missed adding a new file and accidentally invalidated Hero_cleopatra.
Reported by Imarok on IRC.

This was SVN commit r20632.
2017-12-10 11:15:22 +00:00
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
f7aa7ac79e Optimise HierarchicalPathfinder::Update by speeding up the chunk dirtiness check.
By adding a custom function in Grid, the code gets vectorised on both
gcc and clang, resulting in much faster code and faster update times,
sometimes substantially (on giant maps or when few chunks must be
updated).

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D73
This was SVN commit r20630.
2017-12-10 08:59:43 +00:00
1933461009 Slight cleanup of Commands.js.
Removes data.playerEnt and data.cmpPlayerManager.

Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1138
This was SVN commit r20629.
2017-12-10 04:05:43 +00:00
ad2e48da1e Fix broken infinity kill/death ratio summary screen translation comment in b5ea27904d.
Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1133
This was SVN commit r20628.
2017-12-10 03:32:17 +00:00
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
ddf868cfdc Update random maps that use rmgen wall-placement.
Reviewed By: FeXoR
Commented On By: elexis
Refs: #2944, D900

This was SVN commit r20626.
2017-12-10 03:14:00 +00:00
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
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
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
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
13ad114dd6 Move selection ring OverlayTexture code from CCmpSelectable::UpdateTexturedLineOverlay to the SOverlayTexturedLine struct in graphics/Overlay.cpp and SimRender in simulation2/helpers/Render.cpp.
This abstraction allows calling that code again from other simulation
components, like the RangeOverlayRenderer in D555.

Differential Revision: https://code.wildfiregames.com/D1139
Refs #3915, D555
Comments By: Vladislav, echotangoecho
This was SVN commit r20621.
2017-12-10 00:19:51 +00:00
bb
470e9fc8f1 Make houses conquestcritical, since the can train female
Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1018
This was SVN commit r20620.
2017-12-09 20:28:59 +00:00
84e88edd36 Remove pairwise annihilating array constructor and spread operator in e4a5d5b4dd.
Differential Revision: https://code.wildfiregames.com/D1134
Reviewed By: bb
This was SVN commit r20619.
2017-12-09 20:25:23 +00:00
53c9e89591 Move EOverlayType and SOverlayDescriptor from the Selectable component to Overlay.h.
Refs #3915, D568
Patch By: Sandarac
Taken from D555
Reviewed By: Vladislav
This was SVN commit r20618.
2017-12-09 19:49:56 +00:00
53186fbf3a Differential Revision: ​https://code.wildfiregames.com/D403
Reviewed By: elexis, temple,
Comments: fatherbushido

This was SVN commit r20617.
2017-12-09 16:12:04 +00:00
2fd163a08a Remove TechnologyManager relict of 99d04e93bb following c1e86161b5.
This was SVN commit r20616.
2017-12-08 23:11:00 +00:00
ae343e8e9d Adds the basic actor/material validator
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D1016
This was SVN commit r20615.
2017-12-08 21:40:29 +00:00
8684e06ce0 Support translation of mod labels and description.
Differential Revision: https://code.wildfiregames.com/D1083
Reviewed By: Vladislav
This was SVN commit r20614.
2017-12-08 20:51:36 +00:00
3b3f0eb2d6 PlayerManager GetAllPlayers helper function to remove some duplication.
Differential Revision: https://code.wildfiregames.com/D1050
Patch By: temple
This was SVN commit r20613.
2017-12-08 20:39:40 +00:00
5667de04c8 Use Map instead of Object in researchQueued of the TechnologyManager for code symmetry with the two previous commits, a6f14f5631 and dc72833040.
Comments in https://code.wildfiregames.com/D1130

This was SVN commit r20612.
2017-12-08 19:29:10 +00:00
dc72833040 Use Set instead of an Object with unused values in TechnologyManager.researchStarted.
Differential Revision: https://code.wildfiregames.com/D1129
Reviewed By: mimo
This was SVN commit r20611.
2017-12-08 18:47:07 +00:00
a6f14f5631 Remove unused serialized cache of technology templates in TechnologyManager.researchedTechs.
Refs #3834, #3909, #4239, #4868, D1108
Differential Revision: https://code.wildfiregames.com/D1130
Reviewed By: mimo
This was SVN commit r20610.
2017-12-08 18:35:04 +00:00
5f10ae7551 Move viewed player dropdown update to a separate function in preparation of D754.
Differential Revision: https://code.wildfiregames.com/D1126
Patch By: temple
Refs #4747

This was SVN commit r20609.
2017-12-08 18:24:51 +00:00
ad1ab0c3d3 Attack Range Visualization.
Fixes #3915
Differential Revision: https://code.wildfiregames.com/D568
Based on patch by: Sandarac
This was SVN commit r20608.
2017-12-08 13:40:41 +00:00
9c0e37f2c0 Don't serialize the templates of autoresearched technologies.
Refs #3834, #4239
Differential Revision: https://code.wildfiregames.com/D1109
Reviewed By: temple
Comments By: Itms
Proposed By: sanderd17
This was SVN commit r20606.
2017-12-07 23:26:29 +00:00
02cb770c1d adapt petra to 2a6fcafbae
This was SVN commit r20605.
2017-12-07 22:06:58 +00:00
81839be0f1 Adds test in ProductionQueue for the {civ} tech replacement from 8de5c26540
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1125
This was SVN commit r20604.
2017-12-07 21:40:42 +00:00
2a6fcafbae Add a {native} civ replacement in buildable and trainable template names
Reviewed By: wraitii, elexis, with inputs from s0600204
Differential Revision: https://code.wildfiregames.com/D1084
This was SVN commit r20603.
2017-12-07 18:33:08 +00:00
6bbd8297db Fix idle worker button mess.
fb65288463 mimicked the sprite_over button functionality which exists as
a proper property since 5cc814759f.
0e48b7df75 mimicked the sprite_disable and enabled button functionality.
The button now shows the proper highlight sprite if the button became
enabled without one of the prior mouseover events being sent.
Removes duplicate hardcoded filenames and unneeded globals, functions
and conditions.

Refs #2414, #3736
Differential Revision:
Patch By: temple
This was SVN commit r20601.
2017-12-06 21:25:17 +00:00
32981e6f5e Allow the AI to read JSON simulation files and use the Resources prototype from 52f311da2b for the AI directly.
Removes the workaround copy of the resources JSON each turn in
GetSimulationState.

Refs #3934, #4868
Differential Revision: https://code.wildfiregames.com/D1119
Reviewed By: mimo
This was SVN commit r20600.
2017-12-06 20:26:01 +00:00
0d51f0391a Add buttons to visit the website of the selected mod.
Differential Revision: https://code.wildfiregames.com/D1101
Refs #4890
Reviewed By: Grugnas
Comments By: fpre / ffffffff
This was SVN commit r20599.
2017-12-06 19:58:23 +00:00
46dfcf3b95 Simplify Barter component by passing playerID instead of playerEntity.
Differential Revision: https://code.wildfiregames.com/D1114
Refs D1050
Patch By: temple
This was SVN commit r20598.
2017-12-06 13:29:18 +00:00
505c1f5ead Fix typo in 54904b1750.
This was SVN commit r20597.
2017-12-06 12:54:35 +00:00
274902167c Add a move modifier hotkey
Patch by: temple
Differential Revision: https://code.wildfiregames.com/D674
This was SVN commit r20594.
2017-12-05 20:46:11 +00:00
52494580f6 Fix name colors in gamedescription
Patch by: ffffffff
Differential Revision: https://code.wildfiregames.com/D1086
This was SVN commit r20593.
2017-12-05 20:29:10 +00:00
a2f7038ff6 fix oversight in 8de5c26540
This was SVN commit r20592.
2017-12-05 18:10:44 +00:00
af03c72f76 Move GetAvailableMods
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D1106
This was SVN commit r20591.
2017-12-05 17:17:21 +00:00
175171c9d4 Amend wallpiece lengths in preparation for D900.
Values approved of by FeXoR
Refs D900, #2944

This was SVN commit r20589.
2017-12-05 02:39:50 +00:00
fed3fbee5d Expose the same FileExists to JS GUI, simulation and rmgen.
Thus restrict rmgen FileExists from 871ed04521 to rmgen/ and
simulation/.

Refs #4868, 8de5c26540
Differential Revision: https://code.wildfiregames.com/D1104
Same rap as in 0cfe9ab153, 7fda43d14e.

This was SVN commit r20588.
2017-12-05 00:22:03 +00:00
8582dcf47f Check for Technology existence by looking up loaded technologies rather than performing disk access ingame, refs D1024 / 8de5c26540.
Differential Revision: https://code.wildfiregames.com/D1105
Discussed with: mimo

This was SVN commit r20587.
2017-12-04 23:58:44 +00:00
7fda43d14e Expose the same file listing function to JS GUI, simulation and rmgen, refs #4868.
Removes the workaround and limitations of globalscripts Resources
(52f311da2b) and loadCivFiles (89055ef858), allowing them to actually
become actually global.
Rename to ListDirectoryFiles as proposed by wraitii.

Differential Revision: https://code.wildfiregames.com/D1103
Reviewed By: s0600204
Proofread by: echotangoecho
Comments by: wraitii
Relevant discussions with leper in #4868, D1062

This was SVN commit r20586.
2017-12-04 23:46:55 +00:00
54904b1750 Add gui tag color setter function, so that we don't have to read and ensure the color syntax each time.
Differential Revision: https://code.wildfiregames.com/D1088
Patch By: fpre / ffffffff
This was SVN commit r20585.
2017-12-04 17:29:26 +00:00
2c8b78ddaa Option to disable fog effects.
Fixes #4626
Patch By: dp304
This was SVN commit r20584.
2017-12-04 15:54:24 +00:00