Commit Graph

8185 Commits

Author SHA1 Message Date
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
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
8ef7278306 Add a bonus to units on walls + disable placing units on palisades (which was enabled by accident due to inheritance)
This was SVN commit r15249.
2014-05-31 11:02:58 +00:00
f5c5bbe26d some fixes for Petra AI
This was SVN commit r15247.
2014-05-30 15:24:19 +00:00
cfec28e553 Add the Engine code for turrets + use them to get units on walls. The scripted TurretHolder isn't included due to lack of usability for now. Refs #2577
This was SVN commit r15246.
2014-05-30 14:46:06 +00:00
d05bd656e7 Added Sibylline Books tech for Romans.
Tweaked Roman Logistics tech. Tweaked Siwa Oasis skirmish.

Balance changes: -5 attack, -4 range, -10 health for cavalry
skirmishers, after discussion with alpha123.

This was SVN commit r15245.
2014-05-30 04:18:05 +00:00
84d799ed9f Petra: reduce the CPU time for building placement
This was SVN commit r15244.
2014-05-29 20:39:09 +00:00
7105dabca7 fix failing unit training in Aegis and Petra
This was SVN commit r15243.
2014-05-29 20:18:29 +00:00
e0218fff8d New final fix?
This was SVN commit r15242.
2014-05-27 14:54:51 +00:00
7c39259ee5 Now I should get it right
This was SVN commit r15241.
2014-05-27 14:00:21 +00:00
5762721b09 Strange how I'm able to make that many mistakes
This was SVN commit r15240.
2014-05-27 13:42:04 +00:00
82db905b8e Fix previous commit
This was SVN commit r15239.
2014-05-27 12:32:57 +00:00
3413dc84a1 make it possible for mods to add new unit commands
This was SVN commit r15238.
2014-05-27 11:17:29 +00:00
b9f3a95e17 Make UnitAI moddable by exposing the FSM spec and calculated FSM as part of the prototype
This was SVN commit r15237.
2014-05-27 07:24:07 +00:00
e4d3189494 Lots of GUI fixes to issues pointed out by alpha123 on IRC.
This was SVN commit r15235.
2014-05-27 05:34:28 +00:00
a75342e2c7 minor changes in petra: cleanings and timing optimization
This was SVN commit r15234.
2014-05-26 19:52:51 +00:00
b7281c629c Rocks -> Arrows. Fixes #2565.
This was SVN commit r15222.
2014-05-26 04:48:33 +00:00
bc8792ba96 Proper double-click behavior for these champion units. Fixes #2586.
This was SVN commit r15221.
2014-05-26 04:41:35 +00:00
39cfb6748d Fixes flickering in main menu backgrounds on old Intel GPUs, by manually setting the z-values for each layer, fixes #2143
This was SVN commit r15220.
2014-05-26 04:38:47 +00:00
4dd90a1ef3 A new skirmish map.
This was SVN commit r15219.
2014-05-26 04:23:10 +00:00
d7f1427c9b Tweaked Ptolemies sandbox scenario.
This was SVN commit r15218.
2014-05-26 01:28:56 +00:00
7bc0f611b3 Auras for Roman heroes Marcellus and Maximus.
This was SVN commit r15217.
2014-05-26 01:26:53 +00:00
3d306702df Petra: recover some cases where units are blocked because of pathfinder
This was SVN commit r15215.
2014-05-25 10:00:55 +00:00
5ce12c2263 Start phasing out the use of CParser in the GUI. Makes GUI parsing generally faster and stricter while adding better tests and debug information.
This was SVN commit r15213.
2014-05-25 03:16:52 +00:00
9c908a5f46 improve 6764b15ae2 by allowing a selected button to be selected again
This was SVN commit r15212.
2014-05-24 16:23:11 +00:00
6764b15ae2 ease switch to 100% trade of one resource using Shift-click
This was SVN commit r15211.
2014-05-24 15:37:19 +00:00
874ceb76a5 fix JS warning in Petra
This was SVN commit r15210.
2014-05-24 14:52:05 +00:00
8589003ac6 Let for loop return early. Small code style fix.
This was SVN commit r15209.
2014-05-24 10:18:15 +00:00
7f5264d3be Fix test for unhealable and healable classes. Make healers able to heal again
This was SVN commit r15208.
2014-05-24 09:50:10 +00:00
1e3ba2d438 Let formations use the UnitAI.AddOrder method, instead of directly deciding if ReplaceOrder or PushOrder should be used. This replaces the expectedRoute, and might lead to units behaving more as demanded. Refs #2568
This was SVN commit r15207.
2014-05-24 09:40:21 +00:00
9ee17342b1 Change developer overlay to only be openable through Alt+D shortcut. Fixes #2569
This was SVN commit r15205.
2014-05-23 00:18:16 +00:00
84b53933ff fix the AIs broken after b55b6a9cf1
This was SVN commit r15204.
2014-05-22 20:40:14 +00:00
27104a4f33 Remove MaxDistance from Roman merchant ship. See 1207b146bb.
This was SVN commit r15203.
2014-05-22 16:39:00 +00:00
52e807a207 Healers should not heal animals.
If we want war dogs to be healable we should change the class to
Domestic.

This was SVN commit r15202.
2014-05-22 16:38:57 +00:00
ea334e3716 Fix class counting
This was SVN commit r15201.
2014-05-22 16:20:36 +00:00
41de9f6e84 Petra fixes for maps without cc
This was SVN commit r15200.
2014-05-22 15:09:42 +00:00
3fc2574ecf Disable syntagma and testudo for champion cavalry
This was SVN commit r15199.
2014-05-22 14:50:53 +00:00
d20e244a37 fix tests
This was SVN commit r15198.
2014-05-22 14:38:49 +00:00
16c5bc96dc Add ptol and sele hero auras. Fixes #2444. Patch by Silk.
This was SVN commit r15197.
2014-05-22 14:37:11 +00:00
b55b6a9cf1 Add visible class names to all common buildings
This was SVN commit r15196.
2014-05-22 14:31:48 +00:00
ac1a9bf8d1 Clean up class parsing + add visible classes to be displayed in the GUI without adding them separatedly to our tooltips
This was SVN commit r15195.
2014-05-22 10:20:02 +00:00
eaa382a60c This was SVN commit r15194. 2014-05-22 01:38:46 +00:00
ee50168096 Removes errant text from GUI XML files, fixes some untranslated text per [wiki:Internationalization]. Refs #2507
This was SVN commit r15193.
2014-05-22 01:36:45 +00:00
eae7978868 Makes a word consistent with American English
This was SVN commit r15192.
2014-05-21 20:24:37 +00:00
3e985225fc Remove remaining MaxDistance. See 1207b146bb
This was SVN commit r15191.
2014-05-21 14:20:00 +00:00
1207b146bb Let trading range depend on obstruction. Fixes #2556
This was SVN commit r15190.
2014-05-21 14:03:57 +00:00
0a3eb92d62 Add slower game options. Might be usefull for slow players or development. Fixes #2499. Patch by DanCar.
This was SVN commit r15189.
2014-05-21 13:46:42 +00:00
01777a7ade fix tests
This was SVN commit r15188.
2014-05-21 12:28:39 +00:00
2303ad97cf petra: test on cc existence before trying to build
This was SVN commit r15187.
2014-05-21 09:37:41 +00:00
e0fb1223d6 Put the colon inside the translate tag.
This was SVN commit r15186.
2014-05-21 03:02:54 +00:00
153b1162fb changes for the AI to deal with maps with celts and change comment on naval maps
This was SVN commit r15185.
2014-05-20 21:30:48 +00:00
5dbf7ffa1e Portraits for these two Ptol boats.
This was SVN commit r15184.
2014-05-20 21:09:25 +00:00
4707f11b07 Petra AI: fix a bug in naval transport and adapt strategy to initial available resources
This was SVN commit r15183.
2014-05-20 19:48:54 +00:00
99a7bc67ac Fix 672f5a8b11 when sloppyness is 0
This was SVN commit r15182.
2014-05-20 18:45:36 +00:00
317c6057ed Remove members from a formation when they garrison. Fixes #2545
This was SVN commit r15181.
2014-05-20 17:47:47 +00:00
672f5a8b11 Add sloppyness and separate icon path to formation templates (makes it possible to have multiple formation templates - like different settings for different civs - with only one icon file)
This was SVN commit r15180.
2014-05-20 17:18:40 +00:00
41bc9fa65e Remove a newline in a tooltip.
There is no need for it.
Some translations also add the newline that, due to different words
length, appears in an unwanted place.

This was SVN commit r15178.
2014-05-20 10:41:09 +00:00
d8dbd499f8 Probably fixes uninitialized variable warning in GLSL model shader on some drivers
This was SVN commit r15177.
2014-05-20 03:41:46 +00:00
d0e18900ae avoid new harmless spidermonkey warnings
This was SVN commit r15176.
2014-05-19 22:09:44 +00:00
15472f7797 fix Petra not gathering already dead animals and remove forgotten debug printout
This was SVN commit r15172.
2014-05-19 19:45:08 +00:00
dfc7567561 Fix multiple observers on multiplayer games to work more reliably. Fixes #2529
This was SVN commit r15171.
2014-05-19 16:02:42 +00:00
4a3df1c8c5 Add extra check so units can't attack entities out of range. Fixes #2570
This was SVN commit r15168.
2014-05-19 09:05:18 +00:00
196eebe803 Fix partial internationalisation of the limit changers
This was SVN commit r15167.
2014-05-19 08:22:20 +00:00
5ae4619b81 Internationalize the AllowedToCreate method from EntityLimits. Fixes #2546.
This was SVN commit r15165.
2014-05-19 07:35:05 +00:00
81da366268 Deletes some obsolete and broken old art files, refs #2524
This was SVN commit r15164.
2014-05-19 01:47:22 +00:00
61b6eba4c1 Adds a config option for more detailed tooltips. Fixes #2549.
This was SVN commit r15161.
2014-05-19 00:01:47 +00:00
8e6b624ea5 fix civ in template
This was SVN commit r15160.
2014-05-18 17:00:54 +00:00
bd7ebe268e Make skirmish entities better moddable. Fixes #2523. Patch by Idanwin.
This was SVN commit r15159.
2014-05-18 15:53:57 +00:00
7ff5fbda2b Allow system components to be registered on the scripting side (so mods can make their own system components).
This was SVN commit r15157.
2014-05-18 13:44:08 +00:00
814d3dc0e8 fix previous commit
This was SVN commit r15154.
2014-05-18 12:39:58 +00:00
3273720776 major update of Petra AI with first version of naval map support
This was SVN commit r15153.
2014-05-18 11:34:36 +00:00
3596f1c341 modify AI common-api to allow fishing and minor fixes
This was SVN commit r15152.
2014-05-18 10:50:44 +00:00
b7f6c00c2b Mark all components as global variables and allow to re-register existing components to update their schema and/or message receiving methods.
This allows for components to be extended in other files, so mods don't
have to overwrite entire components.
Fixes #2517. Thanks to Rada for helping on this
(also fix some tests broken in the previous commit)

This was SVN commit r15150.
2014-05-18 08:20:02 +00:00
86196212e2 Improve navigation for ship formations by setting the formation controller to the right passability class
This was SVN commit r15149.
2014-05-18 07:59:43 +00:00
0a880413fe Fix the out-of-world error we saw in the team game yesterday
This was SVN commit r15145.
2014-05-11 09:36:12 +00:00
d70abd548a Move yellow modern buttons to their own style to correct naming issues (eg. ModernButtonRed was yellow). New name is ModernButtonYellow. Also switched the default button color back to red due to complaints by team members on IRC.
This was SVN commit r15144.
2014-05-11 03:25:34 +00:00
056d740e7f Fixes #2542
This was SVN commit r15143.
2014-05-10 23:40:53 +00:00
fb2cda5aba prevent weird behaviour when the ship in which we want to garrison is selected with the units to garrison
This was SVN commit r15142.
2014-05-10 22:21:24 +00:00
b2ec4e0e2a Portrait for Roman bireme.
Modern button from red to yellow.

This was SVN commit r15141.
2014-05-10 21:33:46 +00:00
f287a7da12 Elephants can transport aboard Medium and Heavy warships.
This was SVN commit r15140.
2014-05-10 16:15:26 +00:00
da8843127c Fix displaying wrong text when no tooltip was defined, as reported by Kanetaka. Also cleans up the code to make it shorter.
This was SVN commit r15139.
2014-05-10 13:37:38 +00:00
e79ad6b30b Switch Military Colonies to use the mercenary camp actor.
Update a few tech names (shouldn't affect translations).

This was SVN commit r15137.
2014-05-09 00:18:23 +00:00
a5708873db set the right civ for mace dock
This was SVN commit r15136.
2014-05-08 23:15:01 +00:00
2c1917176a Use untranslated playerState.civ, if the civName 'Gaia' happened to be translated, this resulted in an undefined texture, which was the case in Chinese, and reported by Gameboy.
This was SVN commit r15135.
2014-05-08 14:07:48 +00:00
955e6e788a Fix counting foundations as concuestCritical.
This was SVN commit r15133.
2014-05-08 11:27:09 +00:00
8e39a2297d fix delete selection broken (again) in bb65358dac. Code is changed to prevent this to happen again
This was SVN commit r15131.
2014-05-08 08:21:20 +00:00
a620cf8e17 Fixes an issue with unassigned players being functionally ready but not having the green marker
This was SVN commit r15130.
2014-05-08 04:47:57 +00:00
bb65358dac After discussion with scythetwirler with input from Philip and Mythos, popup dialogs (like for delete, resign, and exit) should have no on the right as we want the user to click no in most of those cases. It's the 'recommended' action. In the case of save/cancel or continue/back, save and continue should always be on the right as that's the 'recommended' action. With some review, this placement seems consistant across operating systems.
This was SVN commit r15129.
2014-05-08 03:43:03 +00:00
cbeb40a14b Fix foundations changing entity limits. Fixes #2536
This was SVN commit r15123.
2014-05-07 08:24:31 +00:00
19ca1e3ebf Fix locale verification to also allow ICU locales without data, but still don't allow bogus locales. Patch by Yves. Fixes #2533.
This was SVN commit r15122.
2014-05-07 08:14:57 +00:00
c5b184744c stop failed attack in aegis, see #2486
This was SVN commit r15121.
2014-05-07 07:03:21 +00:00
27382a7d78 Swap OK and Cancel positions on the AI config GUI page. (Also cleanup the XML a bit)
This was SVN commit r15120.
2014-05-06 19:02:34 +00:00
9fadc2709c Clean up the gate transformation tooltips as it caused problems for mods.
This was SVN commit r15119.
2014-05-06 18:52:05 +00:00
34a9b8c260 New song by Omri to the Celtic civs.
This was SVN commit r15118.
2014-05-06 12:28:25 +00:00
OmriLahav
93cfdce090 This was SVN commit r15116. 2014-05-06 08:19:45 +00:00
f181a89c34 fixes wrong test
This was SVN commit r15115.
2014-05-05 19:22:54 +00:00
48bb533895 temporarily disable trader formation, see #2528
This was SVN commit r15111.
2014-05-04 21:38:31 +00:00
06685a3f9b Fix small issue
This was SVN commit r15110.
2014-05-04 20:22:31 +00:00
44b40a85bb Fixes some broken actor references
This was SVN commit r15109.
2014-05-04 08:08:48 +00:00
ba5e6d9168 Removes duplicate FleeDistance property from template_unit_fauna_decorative (found by checkrefs.pl)
This was SVN commit r15108.
2014-05-04 05:52:51 +00:00
9b136a45fc Fixes a couple dialog buttons
This was SVN commit r15106.
2014-05-04 02:44:14 +00:00
2eb2845c29 Extra check on the existance of a replacement, be more forgiving in the skirmish replacer.
This was SVN commit r15104.
2014-05-03 17:53:37 +00:00
dd13e01ac6 Extra check on existance of template, to be more forgiving if some template in the productionqueue doesn't exist.
This was SVN commit r15103.
2014-05-03 17:29:22 +00:00
e70eccf0ca Added Stan's contributor ptol_corral details in Lordgood's model
Added Stan's Cleopatra texture

This was SVN commit r15102.
2014-05-03 13:05:34 +00:00
575cdd7979 A spearman isn't ranged
This was SVN commit r15101.
2014-05-03 13:04:08 +00:00
b09925b27e switch the game setup confirmation buttons and move the welcome screen buttons
This was SVN commit r15100.
2014-05-03 09:21:05 +00:00
542bc1b273 Further fix switched buttons
This was SVN commit r15099.
2014-05-03 09:07:31 +00:00
c1d5f6882c Also switch the button name to disable the correct one.
4e0a588456 only switched the label and the action.

This was SVN commit r15098.
2014-05-03 08:59:31 +00:00
12ec51783d Fix in-game manual display
This was SVN commit r15097.
2014-05-03 08:53:06 +00:00
4e0a588456 Switch more buttons, see 911be4e860
This was SVN commit r15096.
2014-05-03 08:45:19 +00:00