gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity
17,978 Commits 1 Branch 39 Tags
470e9fc8f16a98dc295deeeeb1984ed3fcd283f8
Commit Graph

17978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
elexis 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
elexis 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
Stan 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
elexis 2fd163a08a Remove TechnologyManager relict of 99d04e93bb following c1e86161b5. 
This was SVN commit r20616.
 2017-12-08 23:11:00 +00:00
vladislavbelov 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
mimo 02cb770c1d adapt petra to 2a6fcafbae 
This was SVN commit r20605.
 2017-12-07 22:06:58 +00:00
mimo 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
mimo 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 505c1f5ead Fix typo in 54904b1750. 
This was SVN commit r20597.
 2017-12-06 12:54:35 +00:00
Imarok 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
Imarok 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
mimo a2f7038ff6 fix oversight in 8de5c26540 
This was SVN commit r20592.
 2017-12-05 18:10:44 +00:00
Imarok 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
s0600204 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 2c8b78ddaa Option to disable fog effects. 
Fixes #4626
Patch By: dp304
This was SVN commit r20584.
 2017-12-04 15:54:24 +00:00
elexis 247bde356c Reload water shaders too when changing shader settings. 
Refs #4626
Patch By: dp304
This was SVN commit r20583.
 2017-12-04 15:51:20 +00:00
elexis 30c3b7c3b8 Fix two clang warnings in 61261d14fc reported by leper. 
Differential Revision: https://code.wildfiregames.com/D1064
Reviewed By: fcxSanya
Refs #2305

This was SVN commit r20582.
 2017-12-04 14:30:38 +00:00
bb ac8c0d1d94 Fix of by one error in 9faf90a4b1 
Spotted by temple

This was SVN commit r20581.
 2017-12-04 09:18:05 +00:00
elexis 1bf2221b83 Idle unit hotkey. 
Differential Revision: https://code.wildfiregames.com/D1060
Patch By: temple
Reviewed By: wraitii
This was SVN commit r20578.
 2017-12-04 02:54:51 +00:00
elexis cd571035bb Allow fast-forwarding of matches with only AI players. 
Differential Revision: https://code.wildfiregames.com/D595
Refs #4078
Accepted By: Grugnas
This was SVN commit r20577.
 2017-12-04 02:37:21 +00:00
elexis 0cfe9ab153 Expose the same ReadJSONFile function to simulation, GUI and rmgen. 
This way globalscripts/ can use the same code in all contexts, all paths
are absolute and only one function name is needed.
Remove ReadCivJSONFile which is redundant with this function as well.
Restrict read access of rmgen/ to rmgen/ and simulation/, refs
4275a8a33c, 89055ef858.

Refs #4868
Differential Revision: https://code.wildfiregames.com/D1085
Reviewed By: wraitii
Partial agreement with leper

This was SVN commit r20576.
 2017-12-03 23:02:27 +00:00
elexis 5e85ca5d7b Deprecate type property of mods. 
Such a property should be well defined, but currently it contains
arbitrary text and is redundant with the description.

Differential Revision: https://code.wildfiregames.com/D1082
Refs #4890
Discussed with: leper
Reviewed By: wraitii
This was SVN commit r20575.
 2017-12-03 21:44:16 +00:00
elexis c670f14812 Fix camouflaged oversight in d3ce5289b6 reported by leper and stupidly forgotton regex. 
Complete documentation and validation of loaded mods proposed in D1093.

Differential Revision: https://code.wildfiregames.com/D1081
Reviewed By: wraitii, Itms
This was SVN commit r20574.
 2017-12-03 21:14:54 +00:00
bb 9faf90a4b1 Move undeletable tag to identity component, preparation for allowing units without health component. 
Also fix a missing init from D750/7e1646afd5

Patch By: temple
Differential Revision: https://code.wildfiregames.com/D341
This was SVN commit r20573.
 2017-12-03 20:54:53 +00:00
elexis 9f0484e5ce Delete unused SpiderMonkey GarbageCollection ScriptFunctions ForceGC in the AI and GUI context (e9e05f4efc) and MaybeGC in the random mapgen context (942a45372c). 
Optimizing the memory footprint requires likely different functions
following the new SM versions and a lot of testing,
so having these doesn't lower the effort to achieve optimization while
confusing the reader.

Differential Revision: https://code.wildfiregames.com/D1073
Reviewed By: Yves
This was SVN commit r20572.
 2017-12-03 12:48:21 +00:00
wraitii dcc49a064b Change gathering rally points to use gather nstead of gather-near-position when possible. 
This makes rallypoint flags nicer and is generally more efficient for
unitAI too.
The behaviour falls back to gathering near position for any entity with
a "speed" component, which is set by GuiInterface depending on having
UnitMotion. This thus assumes entities without UnitMotion do not move.
However, Gather falls back to gather near position in case of failure,
so it ought to be fine in general.

Reviewed By: wraitii
Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1014
This was SVN commit r20571.
 2017-12-03 10:25:59 +00:00
wraitii 93b052ba10 Let Fauna cast silhouettes to make them more visible inside forests or behind buildings. 
This doesn't affect purely decorative animals.

Reviewed By: wraitii
Patch By: temple
Differential Revision: https://code.wildfiregames.com/D965
This was SVN commit r20570.
 2017-12-03 10:16:45 +00:00
wraitii 99d486c1d7 Allow models using alpha-blending (transparent models) to be silhouette casters. 
This change ahead of D965, where fauna become silhouette casters, and
several fauna animals are transparent models.

Reviewed By: wraitii
Patch By: temple
This was SVN commit r20569.
 2017-12-03 10:14:16 +00:00
wraitii 0790ceb3ef Fix individual combat when attacked 
In particular, better handle melee units attacking capturing units.

Reviewed By: wraitii
Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1047
This was SVN commit r20568.
 2017-12-03 10:10:13 +00:00
mimo 36fadbb070 fix oversight in 854288a6dc 
This was SVN commit r20567.
 2017-12-02 10:01:40 +00:00
mimo 854288a6dc Add AI difficulty in options 
Reviewed By: elexis
Trac Tickets: #4876

Differential Revision: https://code.wildfiregames.com/D1096
This was SVN commit r20566.
 2017-12-01 20:05:58 +00:00
Itms 0ce7a7f5c8 Go back to the legacy syntax for detecting premake actions. 
The filter command does only filter out premake commands, and does not
act on Lua instructions like this one. Some code refactoring would be
needed in order to take advantage of the powerful filter syntax.

Refs #3439.

This was SVN commit r20563.
 2017-11-29 22:37:09 +00:00
Itms f22dfba717 Support Visual Studio 2015 (MSVC 14.0), fixes #3439. 
VS 2013 stays the default Windows compiler, but support for it will be
dropped as soon as possible.
Tested By: Stan
This was SVN commit r20562.
 2017-11-29 21:16:10 +00:00