1
0
forked from 0ad/0ad
Commit Graph

13413 Commits

Author SHA1 Message Date
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
fd8ffb506b Remove commented out code and add licence headers to COList.cpp/.h.
This was SVN commit r15300.
2014-06-05 14:33:44 +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
d5b4dbcb71 Retain corpses in FoW. Patch by Itms. Fixes #1366.
This was SVN commit r15289.
2014-06-04 22:13:47 +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
c07d394999 Fix GCC build of 2c14d94559. Refs #2589
This was SVN commit r15279.
2014-06-04 03:03:58 +00:00
2c14d94559 Replace usage of CParser for CColor.
Switches format to use integers only.
Adds logging if the string is invalid.
Refs #2589.

This was SVN commit r15278.
2014-06-04 00:58:05 +00:00
db39d742f0 Fix units falling off the edge of the world.
I guess changes to the map loading sequence caused the TerrainChanged
message to be sent before the map was switched from square to circular
instead of after. The pathfinder didn't notice the switch, so it
continued treating the map as if it were square, allowing units to walk
into the permanent map-corner SOD and vanish, and allowing territories
to expand into the SOD.

Tell the pathfinder explicitly when the map shape changes, so it can
discard its cached data correctly.

This was SVN commit r15277.
2014-06-03 22:35:40 +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
4f6afbc0bf Fix non-PCH build.
This was SVN commit r15274.
2014-06-02 20:06:27 +00:00
b4f3b503f2 code style cleanup
This was SVN commit r15273.
2014-06-02 15:48:37 +00:00
a500826ae4 Since the VFS logs the missing files now, there's no reason to crash on it.
This was SVN commit r15272.
2014-06-02 15:41:41 +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
a63ed4e4c4 Fixes rare crash in sound manager, due to worker thread dereferencing global pointer before it had been assigned. Fixes #2333, refs #2387, #2317.
Fixes potential infinite loop if worker thread was running but not
enabled.
Fixes apparent bug in fading sound smoothness.
Cleans up worker class slightly.
Cleans up weird and inconsistent whitespace.

This was SVN commit r15269.
2014-06-02 02:09:58 +00:00
c17bf75cbb Fix bad merge.
This was SVN commit r15268.
2014-06-01 19:06:58 +00:00
fb0b4572ab Fix Valgrind complaint about delete vs delete[].
This was SVN commit r15267.
2014-06-01 18:46:14 +00:00
e6b8339103 Minor optimisation for non-animated units.
This was SVN commit r15266.
2014-06-01 18:25:20 +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
d117d96d22 Simplify component deserialization.
Deserialize SYSTEM_ENTITY before any other entities. This makes it safe
for Deserialize() methods to access system components (mirroring how
Init() can already access system components).

Add a Deserialized message, sent after all entities have been
deserialized, to help with some other sequencing problems.

This was SVN commit r15264.
2014-06-01 18:14:09 +00:00
b30a9a6384 Remove m_NeedInitialXZRotation - not needed after changes to map loading order.
This was SVN commit r15263.
2014-06-01 18:10:00 +00:00
ceb3c3d366 MapReader: Load terrain before entities.
This allows component Init functions to make use of the terrain
immediately, instead of delaying some computations until the first
frame.

This was SVN commit r15262.
2014-06-01 18:08:11 +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
bb16a8ee98 Fix ungarrisoning via ungarrisoning pane
This was SVN commit r15253.
2014-05-31 14:03:00 +00:00
17d83a8b4c Add ungarrison button to ungarrison specific entities
This was SVN commit r15252.
2014-05-31 13:58:16 +00:00
e2aa24fc9a Clean up the turret interface a bit + fix serialisation for turrets
This was SVN commit r15250.
2014-05-31 11:35:07 +00:00