Commit Graph

17350 Commits

Author SHA1 Message Date
fatherbushido 79a9b05b0c Don't tag an entity as packing when the packing is completed. Reviewed by leper.
Differential Revision: https://code.wildfiregames.com/D357
This was SVN commit r19429.
2017-04-18 19:44:43 +00:00
wraitii 4d2508ecf4 Fix prepare times.
Several ranged units had prepare times as high as their repeat time,
making them feel sluggish and animating weirdly. Melee units had none,
resulting in an odd discrepancy betwee n animation and time of damage,
and also weird animations.

Reviewed by fatherbushido.
Differential Revision: https://code.wildfiregames.com/D258
This was SVN commit r19428.
2017-04-18 14:50:29 +00:00
elexis 81c57e8a28 List, add and delete cinematic paths in Atlas.
Doesn't provide a way to add/delete nodes of paths yet.

Differential Revision: https://code.wildfiregames.com/D348
Patch By: Vladislav
This was SVN commit r19427.
2017-04-18 03:30:16 +00:00
elexis 80626db3dc Make that StatisticsTracker code from 045dcd4823 a bit more readable and consistent.
Differential Revision: https://code.wildfiregames.com/D355
Reviewed By: leper
This was SVN commit r19426.
2017-04-18 00:10:25 +00:00
wraitii 1db8562d05 Revert and fix 4523c50850: fix water disappearing in Atlas when clicking on the object tab.
Reviewed by wraitii.
Differential Revision: https://code.wildfiregames.com/D329
This was SVN commit r19425.
2017-04-17 08:59:12 +00:00
wraitii 1ec41f6dd0 Fix crash in dynamic subscriptions when components unsubscribe during deletion.
Discussed with Philip.
Reviewed by fatherbushido
Differential Revision: https://code.wildfiregames.com/D264
This was SVN commit r19424.
2017-04-17 08:00:41 +00:00
fatherbushido de9e76cbf1 Add a test to the component manager to show a crash in dynamic subscriptions when components unsubscribe during deletion. Reviewed by wraitii.
Differential Revision: https://code.wildfiregames.com/D346
This was SVN commit r19423.
2017-04-17 07:55:44 +00:00
elexis adf60c7c49 Support cinematic path creation from trigger scripts.
Differential Revision: https://code.wildfiregames.com/D317
Patch By: Vladislav
Refs #3814

This was SVN commit r19422.
2017-04-17 01:42:11 +00:00
elexis ce5c10c7bb Add FromJSProperty helper function that gets the property of a JS object, thus reducing duplicate checks when getting many properties.
Differential Revision: https://code.wildfiregames.com/D338
Patch By: Vladislav
Refs: https://code.wildfiregames.com/D317

This was SVN commit r19421.
2017-04-16 23:59:20 +00:00
elexis b856ec5ea4 Update the Minimap texture if the waterheight has changed.
Differential Revision: https://code.wildfiregames.com/D344
Patch By: Sandarac
Reviewed By: Vladislav
Refs https://code.wildfiregames.com/D229

This was SVN commit r19420.
2017-04-16 22:13:32 +00:00
elexis 045dcd4823 Allow units without Cost component and use it for the Catafalque template.
Differential Revision: https://code.wildfiregames.com/D334
Reviewed By: Sandarac
This was SVN commit r19419.
2017-04-16 20:46:03 +00:00
fatherbushido 3731490e5a Use armor instead of armour in some strings reported by translators. Reviewed by wraitii and domdomegg.
Differential Revision: https://code.wildfiregames.com/D335
This was SVN commit r19418.
2017-04-16 11:42:15 +00:00
mimo 1639a88627 petra: fix typo from 3c56638e8b
This was SVN commit r19417.
2017-04-15 16:16:58 +00:00
wraitii e7c9559c21 Fix a small mistake in GarrisonHolder.JS that prevented healing-while-garrisoned in rare cases.
Reviewed by fatherbushido.

Differential Revision: https://code.wildfiregames.com/D336
This was SVN commit r19416.
2017-04-15 09:19:36 +00:00
elexis 5462f26aba Move CinemaPath class to the simulation helper directory, because it contains predominantly simulation data that is already serialized.
The remaining graphics code should be moved or removed.

Differential Revision: https://code.wildfiregames.com/D324
Patch By: Vladislav
This was SVN commit r19414.
2017-04-14 23:20:49 +00:00
mimo 78121ff82c fix request-attack broken by d9d1f1bbeb
This was SVN commit r19413.
2017-04-14 19:00:14 +00:00
mimo ed5d8f749e Fix in-game bandbox when gui.scale is not 1
Patch by Dariost
Differential Revision: https://code.wildfiregames.com/D321
This was SVN commit r19411.
2017-04-13 08:11:29 +00:00
wraitii d15b35357e Show effects of game-start tech modifications in Structure Tree.
This also refactors code so that external callers will have an easier
time getting a template value as modified by technologies.

Patch by s0600204.

Reviewed by bb and wraitii.
Differential Revision: https://code.wildfiregames.com/D154
This was SVN commit r19410.
2017-04-11 14:36:30 +00:00
Imarok 16afbf32c8 Fix CChart scaling edgecases (constant value and infinity)
Reviewed by: vladislavbelov
Differential Revision: https://code.wildfiregames.com/D167
This was SVN commit r19408.
2017-04-11 12:27:21 +00:00
elexis 2e37e6a8d9 Remove redundant path name argument from the CinemaManager AddPath function.
Differential Revision: https://code.wildfiregames.com/D310
Patch By: Vladislav
This was SVN commit r19406.
2017-04-11 01:37:00 +00:00
elexis 65cbf12b7e Don't throw NetServer FSM errors if a client presses not-ready just before the host launches the game.
Differential Revision: https://code.wildfiregames.com/D290
Reviewed By: Imarok
Refs #3199

This was SVN commit r19404.
2017-04-10 16:52:52 +00:00
Imarok ee987d3b0d Add some consts to ShaderProgram functions
Reviewed by: vladislavbelov
Differential Revision: https://code.wildfiregames.com/D315
This was SVN commit r19403.
2017-04-10 15:44:33 +00:00
elexis 023e6ca072 Allow the host to pause the game, even if in observer mode.
Patch By: andy5995
Fixes #4520

This was SVN commit r19401.
2017-04-10 00:09:33 +00:00
elexis e4b4126293 Fix Units demo map following the addition of the special filter templates in D215 / d093f714d7.
Expose the FindAllPlaceableTemplates function to the simulation to
remove the hardcoded directory checks as suggested by fatherbushido.
Add the new special template directory from D176 / cd6c31e76e.
Move the code from XML to JS.

Differential Revision: https://code.wildfiregames.com/D277
Reviewed By: Vladislav
This was SVN commit r19399.
2017-04-09 23:46:31 +00:00
elexis 1b3f92d6e4 Display relics in the hero panel.
Rename the buttonset to panelEntities and unify related health tooltips.

Differential Revision: https://code.wildfiregames.com/D289
Reviewed By: Sandarac
Refs #3000

This was SVN commit r19398.
2017-04-09 23:10:50 +00:00
elexis af4466bc99 Update ready state immediately when receiving the message.
Differential Revision: https://code.wildfiregames.com/D304
Reviewed By: Vladislav
Refs #2447

This was SVN commit r19396.
2017-04-09 22:59:04 +00:00
elexis 2f02fb4535 Move OpenGL CinemaPath rendering code to the CinemaManager, so that the remaining simulation data can be moved to the simulation directory.
Add height indicator so that we can actually estimate the location of
the paths in atlas.

Differential Revision: https://code.wildfiregames.com/D306
Patch By: Vladislav
This was SVN commit r19394.
2017-04-09 17:21:01 +00:00
elexis 290e67dc32 Add cinematic page to the atlas editor with one option to enable rendering of existing paths.
Differential Revision: https://code.wildfiregames.com/D301
Patch By: Vladislav
This was SVN commit r19391.
2017-04-09 02:12:20 +00:00
elexis ab2aa4b91b Nerf champion infantry spearmen slightly, so that they lose in direct combat versus champion infantry swordsmen but win against the same if equally backed up by citizen soldiers.
Differential Revision: https://code.wildfiregames.com/D186
Patch By: Grugnas
Reviewed By: borg-
This was SVN commit r19390.
2017-04-08 23:24:44 +00:00
Itms 32c0dc773e Fix memory leak in CCmpPathfinder, patch by Sandarac.
The terrain grid can be renewed without proper deallocation, which
happens at least at the start of a game when MT_TerrainChanged is sent.

Reviewers: wraitii, Itms

Differential Revision: https://code.wildfiregames.com/D247
This was SVN commit r19388.
2017-04-08 15:58:10 +00:00
elexis 2aae9eaaf1 Resource Trickle tooltip.
Add early return to hide loot tooltip if there is no loot (for mods).

Differential Revision: https://code.wildfiregames.com/D292
Reviewed By: fatherbushido
Fixes #4118

This was SVN commit r19387.
2017-04-08 06:45:22 +00:00
elexis d88775017c ...and keep the naming consistent.
This was SVN commit r19386.
2017-04-08 06:11:24 +00:00
elexis 81e267c5f4 Add selection group for catafalque relics as proposed by fatherbushido.
This way they are bundled when selecting them and doubleclicking on them
will select all of them.

This was SVN commit r19385.
2017-04-08 05:28:52 +00:00
elexis 43d627a723 Fix three catafalque auras.
The looter one didn't work at all, the armor one wasn't working as
intended and the max pop one worked but didn't use the proper type.
Order resources in the usual way.
Remove second newline at the end of XML files.

Differential Revision: https://code.wildfiregames.com/D291
Patch By: Hannibal Baraq
This was SVN commit r19384.
2017-04-08 03:39:53 +00:00
elexis 7f07237bba Serialize the queue of cinematic paths playing and resume upon deserialization. Thereby fix an OOS on rejoin when a cinematic path is playing.
Move path de/serialization to private helper functions.

Differential Revision: https://code.wildfiregames.com/D299
Patch By: Vladislav
Refs #3814

This was SVN commit r19382.
2017-04-08 00:10:02 +00:00
elexis 35f7dddbf8 Fix copy & past error in the initial petra AI relic support of 5dcc52f46a. Reported by bb, patch by Sandarac.
This was SVN commit r19381.
2017-04-07 17:23:08 +00:00
elexis ee41e3fd16 Move multiplayer host and join page to a new directory, as it is not related nor doesn't share anything with the gamesetup.
Differential Revision: https://code.wildfiregames.com/D298
Reviewed By: wraitii
This was SVN commit r19380.
2017-04-07 16:44:09 +00:00
fatherbushido 874ee51337 Fix application of tech modifications within the Upgrade component. Patch by s0600204.
Differential Revision: https://code.wildfiregames.com/D146
This was SVN commit r19379.
2017-04-05 15:27:59 +00:00
elexis 2ce840bab3 Handle relics that are destroyed for any reason and maps that have no gaia entities at all.
Differential Revision: https://code.wildfiregames.com/D283
Reviewed By: Sandarac
This was SVN commit r19378.
2017-04-05 04:14:19 +00:00
elexis ffea346abb Atlas camera controls should be disabled too if a cinematic path is paused.
Reviewed By: Vladislav
This was SVN commit r19376.
2017-04-05 04:00:19 +00:00
elexis 5d49e6c456 Move most cinematic path simulation data and control from the graphics class to the simulation component and solve the hash mimatch in non-visual replay.
Move graphics code to smaller helper functions UpdateSessionVisibility,
UpdateSilhouettesVisibility and DrawPaths.
Remove the hotkey TODO code which should be implemented differently.
Mark voids as const.

Differential Revision: https://code.wildfiregames.com/D271
Patch By: Vladislav
This was SVN commit r19375.
2017-04-05 03:59:20 +00:00
Itms c0708da215 Fix the Mustang template. Add tests for the UnitMotionFlying component.
Patch by bb.
Reviewers: Itms

Differential Revision: https://code.wildfiregames.com/D139
This was SVN commit r19373.
2017-04-03 09:58:01 +00:00
Pureon 9c7188ea02 Icon updates
This was SVN commit r19371.
2017-04-02 21:05:10 +00:00
elexis 7f8d57a1f0 Catafalque templates and auras for each civilization.
Patch By: Hanibal Barca aka Hannibal_Baraq
Differential Revision: https://code.wildfiregames.com/D269
Strings Reviewed By: Gallaecio
Balancing Reviewed By: borg-, Grugnas
Addresses few issues found by fatherbushido

This was SVN commit r19370.
2017-04-02 20:50:30 +00:00
fatherbushido 369943426f Make Builder list of some units more consistent. Patch by Grugnas. Reviewed by elexis and wraitii.
Differential Revision: https://code.wildfiregames.com/D262
This was SVN commit r19369.
2017-04-02 09:16:25 +00:00
elexis 6289cd9e99 Fix an error on Survival of the Fittest in 18e7d8a518 in case a player has won and lost the civic center.
Patch By: bb
Differential Revision: https://code.wildfiregames.com/D275
This was SVN commit r19368.
2017-04-01 21:16:59 +00:00
elexis 1e07787e76 Revert 64bit number conversions added in c0ca70efd2, don't add the previous long and unsigned long conversions back and use double in the Replay menu.
64bit conversions (including the long ones) are not safe, because not
every number can be converted to the 2^53 JS numbers and pretending to
do so is asking for bugs.
Explicitly use the double type in the Replay menu, because std::time_t
is unspecified and some platforms like Ubuntu yakkety:i386 fail to
build, looking for long.
Double should work for the next 285 million years, becomes consistent
with SavedGame.cpp, is tested by test_ScriptConversions.cpp and doesn't
pretend to cover all 64bit numbers.

Patch By: echotangoecho
Differential Revision: https://code.wildfiregames.com/D205
Refs #3848 D84 D112

This was SVN commit r19367.
2017-04-01 21:06:55 +00:00
fatherbushido c664fb7b6d Split the automatic aiming function of PerfomAttack for ranged attacks.
Summary:
PerformAttack uses an automatic aiming logic for ranged attacks.
Splitting it would allow to fix some issues with that function, to test
it individually, make it usable as a globalscript for other logic (or
even to disable the automatic aiming based on template).
That patch is just about the splitting, I didn't change it.
Also use only the max range and not the elevation adapted one to scale
the spread (which makes more sense and also avoid computation).

Test Plan: send a javelin?

Reviewers: O2 JS Simulation, wraitii, elexis

Reviewed By: O2 JS Simulation, wraitii, elexis
Subscribers: Vulcan, elexis, leper

Differential Revision: https://code.wildfiregames.com/D272
This was SVN commit r19366.
2017-04-01 07:16:46 +00:00
wraitii 173a7dc214 Change clearance of large land units from 4 to 3, clearance of large ships from 12 to 10. This makes these units far more usable.
Reviewed by Elexis and Fatherbushido.
Differential Revision: https://code.wildfiregames.com/D253
This was SVN commit r19365.
2017-03-31 14:50:04 +00:00
fatherbushido 38a30ea563 Remove useless TemplateManager existence check and extend the related test
Summary: cf c9b0db7f5f

Test Plan: -

Reviewers: vladislavbelov, elexis

Reviewed By: vladislavbelov, elexis
Subscribers: Vulcan

Differential Revision: https://code.wildfiregames.com/D279
This was SVN commit r19363.
2017-03-30 19:53:25 +00:00