Commit Graph

8443 Commits

Author SHA1 Message Date
7266ea681b Allow mixing the buttons for the right pane, so make it possible to have a structure that can pack and produce units. Refs #1919
This was SVN commit r15387.
2014-06-18 11:23:22 +00:00
054706a114 Allow showing the productionqueue for multiple selected buildings at once
This was SVN commit r15386.
2014-06-18 10:46:41 +00:00
94b49a01a9 Adapt the relaxNG files to new gui changes
This was SVN commit r15382.
2014-06-17 18:45:40 +00:00
02fd235bbd Make hotkeys and top panel fully moddable by splitting up the xml file. Allow entire directories to be loaded via an 'include' to provide extra moddability (modders don't have to edit any files, they can just add new ones).
This was SVN commit r15380.
2014-06-17 13:03:55 +00:00
8c547a3fad Fixes a few other invalid XML files reported by the validator script, refs #245
This was SVN commit r15379.
2014-06-17 03:53:13 +00:00
aa04b6d782 Fixes invalid actors reported by XML validator script. Some were only technically invalid but others were broken. Refs #245
This was SVN commit r15378.
2014-06-17 03:49:37 +00:00
2c9939ac74 Adds Relax NG Compact syntax grammars for most of the XML formats in the engine.
Adds converted Relax NG XML grammars for each (Note: don't edit these
directly, modify the compact syntax .rnc files instead, then use a
conversion tool http://relaxng.org/#conversion to generate the .rng
files).
Adds Perl script to validate the XML files using the new grammars

This was SVN commit r15377.
2014-06-17 03:31:40 +00:00
d11e48cd85 Petra: bugfixes + improved attack/defense behaviour
This was SVN commit r15376.
2014-06-16 22:03:30 +00:00
013ab4bda7 Make the barter panel uniform with the others, clean up more gui code.
This was SVN commit r15375.
2014-06-16 18:34:27 +00:00
ce3b11a3fe fix the fix of setHeldPosition in b17ffaeb7e
This was SVN commit r15374.
2014-06-15 17:27:03 +00:00
f115759901 Handle mods specified on the command line when using the archive builder.
This was SVN commit r15372.
2014-06-15 16:43:08 +00:00
bec1e1edfd fix b17ffaeb7e + fixes from FalseVision on setHeldPosition
This was SVN commit r15371.
2014-06-15 16:41:01 +00:00
74e5c8ae26 fix e2b493bb67
This was SVN commit r15370.
2014-06-15 16:13:12 +00:00
86aa30e0d9 Remove useless line in UnitAI, found by FalseVision
This was SVN commit r15368.
2014-06-15 14:38:25 +00:00
1e38fa7b58 UnitAI fix by FalseVision
This was SVN commit r15367.
2014-06-15 14:23:49 +00:00
ef7e19c13e reset petra debug left in previous commit
This was SVN commit r15365.
2014-06-15 12:59:19 +00:00
b17ffaeb7e Petra: make better use of garrisoning when attacked
This was SVN commit r15364.
2014-06-15 12:57:12 +00:00
9a743d65fe Fix to unitAI by FalseVision + fix a mistake of my own
This was SVN commit r15363.
2014-06-15 12:43:52 +00:00
89f33e7579 Fix group number rendering
This was SVN commit r15362.
2014-06-15 12:08:58 +00:00
e042fa8768 Make trigger points templates
This was SVN commit r15361.
2014-06-15 11:25:25 +00:00
beaf3139c0 Move position calculation of buttons to something cleaner.
This was SVN commit r15360.
2014-06-15 09:56:54 +00:00
5064f2728f Fix tech pairing visuals + hiding
This was SVN commit r15359.
2014-06-15 07:56:40 +00:00
f460057700 Fix error for entities that require a technology to be trainable.
This was SVN commit r15357.
2014-06-14 22:28:06 +00:00
2766ae7eb5 Marker objects for Atlas
This was SVN commit r15356.
2014-06-14 18:44:18 +00:00
e152223a53 fix fix
This was SVN commit r15355.
2014-06-14 18:21:48 +00:00
b93877571f Add missing quotation mark to quote.
This was SVN commit r15354.
2014-06-14 17:20:09 +00:00
86ca3b2142 Small cleanup: i, numbButtons and numberOfItems all contain the same value anyway
This was SVN commit r15352.
2014-06-14 15:57:42 +00:00
7f172037ac Clean up a big part of unit_commands.js, and bring most data to a separate JS object (instead of having deep nests of switches and if-else structures)
This was SVN commit r15351.
2014-06-14 15:35:13 +00:00
5903935e4a let the AIs know when a training has started
This was SVN commit r15350.
2014-06-14 14:34:37 +00:00
4e6a21e9da fix promotion of autogarrisoned units (forgot in previous tag)
This was SVN commit r15349.
2014-06-14 14:26:51 +00:00
e2b493bb67 fix double-click on a garrisoned hero button should select its holder, even if from autogarrison
This was SVN commit r15348.
2014-06-14 14:21:30 +00:00
7cf927baec fix typo from 2b8758745f
This was SVN commit r15347.
2014-06-14 14:14:33 +00:00
8d164ca5d1 Add civ requirement to tech that was missed in the previous commit. Refs #2580.
This was SVN commit r15346.
2014-06-13 21:02:32 +00:00
121f14d521 Add civ requirements to civ specific techs. Patch by s0600204. Refs #2580.
This was SVN commit r15345.
2014-06-13 16:16:31 +00:00
1142fc55ca Clean up Commands.js a bit.
This was SVN commit r15344.
2014-06-13 16:16:25 +00:00
58e628338c Also check if a technology was already researched when checking requirements. Fixes #2580.
This was SVN commit r15343.
2014-06-13 16:16:10 +00:00
9990d4c885 Actually call the function instead of testing if it exists. Patch by falsevision. Fixes #2626.
This was SVN commit r15342.
2014-06-13 12:54:57 +00:00
55247e926a Remove legacy trading pane
This was SVN commit r15341.
2014-06-13 12:06:57 +00:00
2b8758745f put the unit commands in a JS object
This was SVN commit r15340.
2014-06-13 11:35:16 +00:00
2b408e766b Fix problem with setting up trade routes
This was SVN commit r15339.
2014-06-13 08:01:06 +00:00
350d4a6b7e add rally points for the AIs
This was SVN commit r15338.
2014-06-12 18:41:13 +00:00
e3f3051b2a Petra: code cleaning and minor improvments
This was SVN commit r15337.
2014-06-12 16:47:43 +00:00
2e00628562 Take the action definitions out of input.js, and in a separate JS object that can be edited by other scripts. This makes it possible to easier add new actions by editing this new script, or (in mods) even by editing the object in other scripts.
This was SVN commit r15336.
2014-06-12 13:47:37 +00:00
2e4441b528 Minor typos in text strings
This was SVN commit r15335.
2014-06-12 13:24:36 +00:00
89f5e7b260 Improve gui moddability by allowing to load an entire directory of scripts at once, and being able to split up big gui XML files. Fixes #2622
This was SVN commit r15330.
2014-06-11 17:14:35 +00:00
791eba9451 Fix Splash damage calculation. Patch by falsevision. Fixes #2623
This was SVN commit r15329.
2014-06-11 14:02:02 +00:00
b289303c25 Fix setting rallypoint via the minimap + fix out-of-world problem when the targeted entity for a rallypoint disappeared
This was SVN commit r15328.
2014-06-11 13:36:12 +00:00
49194819f6 Schwarzwald random map. Script by niektb, with random terrain generation from FeXoR.
This was SVN commit r15327.
2014-06-10 19:59:17 +00:00
6d0df59697 Fix theatrons
This was SVN commit r15326.
2014-06-10 14:27:43 +00:00
8551a799d0 Petra: prevent gatherers to stay blocked when UnitAI make them return resource in an inaccessible dropsite, see #2563
This was SVN commit r15325.
2014-06-10 13:45:23 +00:00
57a7bbcb90 fix javascript warning
This was SVN commit r15324.
2014-06-10 13:34:49 +00:00
3b519b132a fix undefined variable in petra
This was SVN commit r15323.
2014-06-10 13:27:49 +00:00
60212b0418 Fix Iberian monument.
This was SVN commit r15322.
2014-06-10 13:18:33 +00:00
7cb6768132 fix productionTime computation on AI common-api
This was SVN commit r15321.
2014-06-10 12:59:42 +00:00
9723f73262 Fix tests
This was SVN commit r15320.
2014-06-09 18:13:29 +00:00
1d7001c8cd Fix walls + remove debug warning
This was SVN commit r15319.
2014-06-09 17:51:23 +00:00
2fb0262142 Futher clean up heroes tooltips + move auras to the templates. Hope they have a bigger chance of staying consistent now.
This was SVN commit r15318.
2014-06-09 17:35:37 +00:00
3a2670f7fa Take aura descriptions out of tooltip, let auras be defined in the entity template rather than in JSON files, as they can't be reused anyway. Fix tooltips and auras for all heroes from athen to gaul.
This was SVN commit r15317.
2014-06-09 14:15:05 +00:00
d6b8f1989e Petra: complete and improve 2c0daaf80b
This was SVN commit r15316.
2014-06-09 13:30:41 +00:00
1776aa4750 Continue the transition to the usage of visible classes. Fix Hero inheritance for that.
This was SVN commit r15315.
2014-06-09 09:32:36 +00:00
2c0daaf80b Petra: improve choice of ships to train and some style cleaning
This was SVN commit r15314.
2014-06-09 07:54:59 +00:00
5f42834710 some aegis fixes, patch by falsevision, close #2617
This was SVN commit r15313.
2014-06-09 07:48:29 +00:00
91a511560c remove code dupplication for dock angle computation
This was SVN commit r15312.
2014-06-08 16:00:00 +00:00
049caba9f9 Let the timer hold the latest turnLength instead of the Attack component. Reduces a lot of messages
This was SVN commit r15311.
2014-06-08 09:39:57 +00:00
40b351a99a Fixes error in silhouettes hotkey handler
This was SVN commit r15308.
2014-06-08 02:04:29 +00:00
72706f708b Some unfinished maps for others to finish if they wish.
Tweaked Siwa Oasis.

This was SVN commit r15307.
2014-06-07 14:39:01 +00:00
27ca5fe19d Iberians now have the Celtic war barge.
This was SVN commit r15304.
2014-06-07 11:21:42 +00:00
67a4af0fe0 fix typo from a4f2c2ac90
This was SVN commit r15303.
2014-06-05 18:29:11 +00:00
a96953efea remove dupplicated (and buggy) line introduced in 0fcc074a65
This was SVN commit r15302.
2014-06-05 17:51:06 +00:00
53ea269af0 Add the ability to specify a log level when using dlopen and change it to normal for Atlas.
This way we do not have two error messages when starting Atlas, but the
dynamic Atlas lib is not available.
Patch by Gallaecio. Fixes #1540.

This was SVN commit r15301.
2014-06-05 17:07:04 +00:00
c699409246 Add translation context to stances.
This was SVN commit r15299.
2014-06-05 14:06:15 +00:00
55760f6413 cache the affected players in order to remove the template bonuses given by auras from the right players before adding them again.
This was SVN commit r15298.
2014-06-05 11:24:31 +00:00
2d1f9c33dc Bring healable classes to the uniform class matching
This was SVN commit r15297.
2014-06-05 10:34:41 +00:00
638123950c Check if the position changed before updating it for rally points set on entities. Refs #1257.
This was SVN commit r15296.
2014-06-05 10:27:40 +00:00
fd615c4c54 Round some alpha values for overlays.
This was SVN commit r15295.
2014-06-05 10:22:16 +00:00
a4f2c2ac90 Allow for unification in identity class matching + add the opportunity to combine with AND and OR. Fixes #2612
This was SVN commit r15294.
2014-06-05 09:39:36 +00:00
cbfbc72d36 Other auras fix
This was SVN commit r15293.
2014-06-05 07:57:05 +00:00
02c68064ed Fix syntax errors in two auras.
Some code style cleanup in aura related files.

This was SVN commit r15290.
2014-06-04 22:27:36 +00:00
b09a702c60 Recompute rally point lines when the rally point is set on a moving unit.
Does not account for setting rally points on units that can move into
the FoW/SoD.
Recalculates paths even if the rally points are not displayed.
Refactors UpdateMarkers() to remove some indentation levels.
Based on patch by Itms. Fixes #1257.

This was SVN commit r15288.
2014-06-04 22:07:58 +00:00
6b015e935e remove a forgotten debug warning in petra
This was SVN commit r15287.
2014-06-04 20:52:21 +00:00
0fcc074a65 Petra: try to improve cart shipyard placement
This was SVN commit r15286.
2014-06-04 20:13:15 +00:00
d883fc332d Correct mime-types and end-of-lines for the XML files in simulation/templates
This was SVN commit r15285.
2014-06-04 17:21:24 +00:00
b67aca01c8 Fix color fade to not go beyond 255 and be integer.
This was SVN commit r15284.
2014-06-04 16:23:56 +00:00
8d2835d9e0 Fixed resource balance for players 3 and 4. (they didn't have chickens or huntable fauna before).
This was SVN commit r15283.
2014-06-04 15:59:43 +00:00
685d5e0197 Switch default AI to Petra and remove an old Aegis warning.
This was SVN commit r15282.
2014-06-04 15:29:20 +00:00
9a7984c544 Fix class checking for technologies
This was SVN commit r15281.
2014-06-04 12:07:35 +00:00
b6870bf415 Move the extraction of the classes from templates to the global scripts, and let the AI use it to reduce redundancy.
This was SVN commit r15280.
2014-06-04 08:42:48 +00:00
0900005e5b fix #2605
This was SVN commit r15276.
2014-06-03 19:41:11 +00:00
86a99b745e Petra: code rearrangement + small improvments
This was SVN commit r15275.
2014-06-02 20:21:28 +00:00
b4f3b503f2 code style cleanup
This was SVN commit r15273.
2014-06-02 15:48:37 +00:00
49ca719049 Reinitialize music when hotloading. Fixes crash when hotloading GUI files.
This was SVN commit r15271.
2014-06-02 15:13:16 +00:00
1882f28504 New unit renderer.
Instead of each CCmpVisualActor rendering itself individually, collect
all the units in a single CCmpUnitRenderer. This avoids the overhead of
doing Interpolate/RenderSubmit calls every frame for every object in the
world. It also allows more efficient culling.

CCmpUnitRenderer knows the positions of each object at the start and end
of each turn, and computes the bounding sphere of the object along that
path. That allows quick culling without recomputing the precise
interpolated transform every frame. (In the future it could be improved
much more.)

Clarify and clean up the sending of PositionChanged messages, and add
new InterpolatedPositionChanged.

Remove the forceFloating parameter from GetInterpolatedTransform, since
it doesn't fit the new design. Replace it with a (non-synchronised) flag
in CCmpPosition.

Move construction progress from CCmpVisualActor to CCmpPosition, so that
it consistently affects all position/transform computation.

Refs #2337.

This was SVN commit r15265.
2014-06-01 18:24:50 +00:00
fe3315376c Add BoundingSphere, SOverlaySphere.
BoundingSphere is similar to a bounding box, but more spherical.

SOverlaySphere is useful for visualising BoundingSphere (it's quite
inefficient and should only be used for debug functionality).

Normalise the camera frustum clipping planes, so that IsSphereVisible
gives the correct result.

This was SVN commit r15261.
2014-06-01 18:05:46 +00:00
3b0fee9073 This was SVN commit r15260. 2014-06-01 13:15:16 +00:00
ac925ed1b6 fix 8efc3b0241
This was SVN commit r15259.
2014-06-01 12:49:34 +00:00
8efc3b0241 code rearrangement
This was SVN commit r15258.
2014-06-01 09:47:12 +00:00
6f11097c00 Allow the CLI to load skirmish maps. From now on, the directory must be included in the map path to load any maps (see the readme). Patch by Teiresias. Fixes #2572
This was SVN commit r15257.
2014-06-01 08:18:46 +00:00
38130e5b94 Brit woman can build rotary mill now.
Spartan commando can build the Theatron now.

Sibylline Books tech from Roman Wonder to Roman Temple.

This was SVN commit r15256.
2014-06-01 04:13:19 +00:00
608ab456d5 fix tests
This was SVN commit r15255.
2014-05-31 14:57:14 +00:00
59c9ae670f Stop VFS from causing a crash when the AI player isn't found. Patch by Itms. Fixes #2558
This was SVN commit r15254.
2014-05-31 14:55:09 +00:00