Commit Graph

20077 Commits

Author SHA1 Message Date
Alexandermb ed11b3f039 Some tweak to animation in the 2nd swordsman shield attack
This was SVN commit r23075.
2019-10-17 04:22:57 +00:00
bb b69ffee9b1 Fix PanelEntButton undefined, by not trying to fill gui elements that don't exist
Comments by: elexis
Differential Revision: https://code.wildfiregames.com/D1397
fixes: #5504
refs: #3000

This was SVN commit r23074.
2019-10-15 14:24:08 +00:00
Stan b99fc1a24d Add new rubble for the gaul civic_center.
Use the the new destroyed texture for the brit rubble, and the celt_dock
rubble.

This was SVN commit r23073.
2019-10-13 17:16:52 +00:00
elexis 34325ac4e3 Refactor trade dialog and barter panel buttons to use object orientation, refs #23, #2311, #4366, #5387, 8cbab40137, 749c4d5270, 5f95bca6b0, a934dfad5f.
Differential Revision: https://code.wildfiregames.com/D2369
This was SVN commit r23072.
2019-10-13 03:43:42 +00:00
elexis f2778ea7b4 Fix atlas complaining about the diplomacy dialog following 6814a983e1/D2365, refs 966b1608da.
This was SVN commit r23071.
2019-10-13 03:04:08 +00:00
Stan 1578079f3d Fix the last remaining warnings introduced by 2a1681d5c7
Add a parent variant for the camelry gather variants
Make the camelry use those variants so that they get the custom knife.
Remove the glitching basket for camelry, as its gather_meat and they do
not use it anyway.
Remove the bow while gathering as well. If it should be displayed, it
should either be on the camel, or on the unit shoulder.

This was SVN commit r23070.
2019-10-12 16:24:13 +00:00
elexis 197ab42bd2 Remove catch of critical PSERROR_Scripting exceptions in the GUI that is obsolete for the intended case and wrong for the unintended case.
The catch had been introduced in 953fb41c82, seemingly to catch the case
PSERROR_Scripting_LoadFile_OpenFailed from 1e40ed1543 which was removed
in 4b1297b328, refs D2363.
The LoadGlobalScript and LoadGlobalScriptFile functions don't throw
these errors unless that JS code calls broken C++ code throwing that.
In that case catching the error and continuing like nothing happened
leads to subsequent segfaults and similarly severe errors caused by C++,
not XML.

Differential Revision: https://code.wildfiregames.com/D2366
Tested on: clang 9.0.0, gcc 9.2.0, Jenkins/vs2015
Accepted By: nani
This was SVN commit r23068.
2019-10-11 19:30:28 +00:00
elexis a01e68a4ea Don't leak all GUI objects on name ambiguity following 5cc814759f and remove ERROR_GROUP GUI.
Delete CGUI::UpdateObjects and don't recreate the entire object
hierarchy by recursing through the existing one each time when inserting
one GUI Object.
Change CGUI::AddObject to only insert the one relevant pointer into the
map hierarchy, return success value and delete the child upon failed
insertion in the caller instead of leaking it.
Defer GUIM_LOAD and UpdateCachedSize recursion until all XML files
linked in the page XML file were loaded.
Delete related ERROR_TYPE NameAmbiguity, ObjectNeedsName, and unrelated
JSOpenFailed and in consistency with the rest, do the LOGERROR in the
scope where the error occurs.
Delete ERROR_TYPE InvalidSetting from 90f6641c1d unused following
85a622b13a, 1a49ccb294, ERROR_TYPE OperationNeedsGUIObject from
90f6641c1d unused following d3e56f0f57, see also e1014aad3b, refs #128.

This was SVN commit r23067.
2019-10-11 16:20:50 +00:00
elexis bd914702fb Fix missing file in previous (diplomacy dialog class rewrite), refs 6814a983e1/D2365, reported by Freagarach.
This was SVN commit r23066.
2019-10-11 15:47:59 +00:00
elexis 6814a983e1 Refactor diplomacy dialog to use object orientation paradigm using the class keyword, refs #5387.
Includes dilomacy colors, tribute buttons, spy request buttons, attack
request buttons, minimap panel, idle worker button, ceasefire counter.
Differential Revision: https://code.wildfiregames.com/D2365
Use hotkey release event from 78bc56f33e to remove input.js state and
evil global nested closure hackery from cb890ad876, refs #1839, #3194.
Fixes masstribute selecitonchange issue subject of D1191.

This was SVN commit r23065.
2019-10-11 12:28:12 +00:00
Alexandermb 44b03ed823 Remove unused variant and replace rider run animation in base_spearman_shield_reverse_attack.xml
This was SVN commit r23064.
2019-10-09 23:36:18 +00:00
Alexandermb d4dffa0dbf Replace elephant_asian_armored_03.dae wrong mesh with the respective mesh.
This was SVN commit r23063.
2019-10-07 01:43:48 +00:00
elexis 47f5c27eec Rewrite session chat to use hierarchical object oriented design using class syntax, refs #5387.
Set global hotkeys in JS instead of empty XML objects from
f192d4a2fa/D2260.

Differential Revision: https://code.wildfiregames.com/D2355
This was SVN commit r23062.
2019-10-06 14:42:12 +00:00
Alexandermb b76239cbe7 Fix "Didn't find any objects in the scene" in elephant_asian_armored_03.dae
This was SVN commit r23060.
2019-10-05 15:25:07 +00:00
Alexandermb fe8f284869 Remove duplicated vertex groups and props from elephants
Mentioned by @stan in this thread:
https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/21/&tab=comments#comment-386080

This was SVN commit r23059.
2019-10-05 14:51:22 +00:00
Alexandermb dc21504b5d Fix weight on ship sails missing in the mastiff.
This was SVN commit r23058.
2019-10-05 14:20:50 +00:00
Alexandermb e61d6ac8d2 Remove unused animation and tweak levy idle ready.
This was SVN commit r23057.
2019-10-05 13:21:07 +00:00
Alexandermb a5c2cc6cd5 Replace gather meat animation on camel riders.
Fix latest issues mentioned by @stan in this thread:
https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/21/&tab=comments#comment-386055

This was SVN commit r23056.
2019-10-05 13:19:23 +00:00
Stan ae50e10339 Add missing garrisoned flag on the cart temple missing since 9a4fcd55a8
Reported by: @faction02
Thread:
https://wildfiregames.com/forum/index.php?/topic/26896-fixed-ninja-stuff-or-bug/&tab=comments#comment-386061

This was SVN commit r23055.
2019-10-05 12:27:06 +00:00
elexis 8cd9d402fe Correct button hovering following 8190293f8b / D2325, clarify difference between IsMouseOver and IsMouseHovering following 5122b0f906.
Differential Revision: https://code.wildfiregames.com/D2354
Tested on: clang 8.0.1, Jenkins/vs2015

This was SVN commit r23054.
2019-10-05 09:58:31 +00:00
Alexandermb 92f7df696d Make generic the infantry swordsman idles so it can be used by all sword infantry shield kinds.
Add base variant file for the romans/infantry_swordsman_c3.xml.

This was SVN commit r23052.
2019-10-05 02:11:58 +00:00
Alexandermb 9a95d21760 Replace run on female variant with proper running.
Reported by @stan

Change running animation speed to match the movement ingame.

Rotate spear while running for the hoplite/run_relax.dae animation.

This was SVN commit r23051.
2019-10-05 01:25:32 +00:00
Alexandermb e0e892efec Separate skirts from legs in short and long tunic meshes.
Re-export some body meshes with the proper vertex groups.

Fix rotation in hand while carrying meat in the cavalry riders.

This was SVN commit r23050.
2019-10-05 01:13:30 +00:00
Alexandermb 2a1681d5c7 Camel riders animations re-export.
This was SVN commit r23049.
2019-10-05 00:52:32 +00:00
Alexandermb 170bfed010 Mauryan trader animation re-export.
Tweaked the male walk animation.

This was SVN commit r23048.
2019-10-05 00:16:52 +00:00
Alexandermb 46de7fe751 Replace death animation on turret elephant riders.
replace variant in elephant rider capes.

This was SVN commit r23047.
2019-10-05 00:04:33 +00:00
vladislavbelov d7ea078583 Removes unused variables after 7f38bef8e1 and 75d9c6293b. Reported by elexis.
This was SVN commit r23046.
2019-10-04 22:06:52 +00:00
Alexandermb 04745e7fdf Continue the cleaning of the unused files with the recent elephant animations re-export.
This was SVN commit r23045.
2019-10-04 21:35:23 +00:00
vladislavbelov e2f0e409f0 Adds containers serialization tests, std::set serialization and movement semantics
Reviewed By: elexis
Tested By: elexis, Freagarach
Differential Revision: https://code.wildfiregames.com/D2352
This was SVN commit r23044.
2019-10-04 21:30:52 +00:00
Alexandermb 273d7949a2 Replace asian_armored variant in two heros elephants + fix a wrong face in elephant_asian_armored_04.dae model.
This was SVN commit r23043.
2019-10-04 20:13:44 +00:00
Alexandermb 893a727cd5 Fix a typo in last commmitt.
This was SVN commit r23042.
2019-10-04 19:30:22 +00:00
Alexandermb 5512fdb9ef Remove an unused elephant variant and replace african forest variant.
This was SVN commit r23041.
2019-10-04 19:29:07 +00:00
Alexandermb 40f0f3d455 Elephant re-export and animations for the riders.
This was SVN commit r23040.
2019-10-04 17:15:51 +00:00
Alexandermb ed4208c538 Reduce frame lenght on new citizen idles to keep in sync with global idle frame lenght.
This was SVN commit r23037.
2019-10-04 03:09:22 +00:00
vladislavbelov 75d9c6293b Adds projection type to CCamera to control usages of projection dependent properties.
Commented By: elexis
Differential Revision: https://code.wildfiregames.com/D2351
This was SVN commit r23036.
2019-10-03 18:51:40 +00:00
Alexandermb eff68a51c0 Citizen animations for the slave and siege engine operators.
Added frequency tags on variants.

12 Citizen animations.
1 tweak on hoplite static idle.

This was SVN commit r23035.
2019-10-03 17:31:17 +00:00
vladislavbelov 8d2b143cb8 Cleanup Camera related code and uses constant references where possible, fixes #5408.
Patch By: shh
Reviewed By: wraitii
Tested By: Angen
Commented By: Stan, Itms, historic_bruno
Differential Revision: https://code.wildfiregames.com/D1784
This was SVN commit r23034.
2019-10-03 13:20:56 +00:00
vladislavbelov a19b14aeb7 Cleanup Camera related code and uses constant references where possible.
Commented By: elexis
Differential Revision: https://code.wildfiregames.com/D2350
This was SVN commit r23033.
2019-10-03 12:58:47 +00:00
vladislavbelov 7f38bef8e1 Splits Camera control from CGameView to separate file.
Commented By: elexis, Stan
Differential Revision: https://code.wildfiregames.com/D2347
This was SVN commit r23031.
2019-10-02 20:55:43 +00:00
Alexandermb 491987fd69 More lifelike idle animations and some new sword attacking animations for scutum like shields.
Sync hoplite idles time/frames so the cape follows the body.

This was SVN commit r23030.
2019-10-02 17:27:44 +00:00
Stan 28e94c0d96 Cleanup CCmpRallyPointRenderer
Replace std::deque by std::vector
Replace some casts by cpp casts
Move the class and struct declaration to a separate file for clarity.
Fixes db864f10c3 by removing offending function
Refs #5288
Refs D1681

Reviewed by: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D1682
This was SVN commit r23029.
2019-10-02 15:01:46 +00:00
elexis 6db0f91823 Sort GUI Object types, GUI Object bases and GUI Setting value types into three new folders.
Differential Revision: https://code.wildfiregames.com/D2345
Tested on: gcc 9.1.0
Comments By: Vladislav
This was SVN commit r23028.
2019-10-02 09:44:00 +00:00
vladislavbelov 1cf6c6b63c Moves CSmoothedValue to separate file.
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D2346
This was SVN commit r23026.
2019-10-01 22:42:54 +00:00
vladislavbelov 45a18c652d Removes unused methods and hides private member.
Commented By: elexis
Differential Revision: https://code.wildfiregames.com/D2342
This was SVN commit r23025.
2019-10-01 21:11:29 +00:00
Alexandermb f1395c947a New idle relax animations for the hoplite.
5 new animations and renamed 1.

This was SVN commit r23024.
2019-10-01 20:21:45 +00:00
elexis 32d6d07eda Rename CClientArea to CGUISize, GUIbase.h to CGUISize.h, avoid temporary instances and default value and error duplication.
The name is in accordance with its JS classname, member names and
setting names.

Differential Revision: https://code.wildfiregames.com/D2341
Tested on: clang 8.0.1, Jenkins/vs2015

This was SVN commit r23023.
2019-10-01 15:06:13 +00:00
elexis 07cc1ba34c Move GUIbase structs and enums to separate files.
Differential Revision: https://code.wildfiregames.com/D2340
Tested on: clang 8.0.1, Jenkins

This was SVN commit r23022.
2019-10-01 12:46:55 +00:00
elexis 8190293f8b Remove virtual inheritance from the codebase, refs 6b51d71c85, e21ebb37f5 e326ebae46.
Remove workaround in 3d07327837 / D2136, the pointer from IGUIObject to
IGUITextOwner that avoided the dynamic_cast.
Have the GUIObject implementing class take responsibility of calling the
virtual methods in the base classes.
Leaves the code in a clean state that can serve as an example for new
GUI object classes, such as D1346, refs #4683.

Differential Revision: https://code.wildfiregames.com/D2325
Comments By: Vladislav on IRC 2019-07-30, 2019-08-22, 2019-09-20-23
Tested on: clang 8.0.1, Jenkins

This was SVN commit r23020.
2019-09-30 14:08:14 +00:00
elexis 1679510bb8 Resolve Loader memory leak from 1f1642bfe3.
Use C++11 featured shared_ptr to avoid conditional deletion in multiple
locations.
Drops C compatibility(?) of Loader.h.

Differential Revision: https://code.wildfiregames.com/D2331
Tested on: clang 8.0.1., Jenkins
Comments on IRC #wfg 2005-05-07
Refs 77d3c5d0b5, 5e3b0f06ec, f19d8dafee.

This was SVN commit r23019.
2019-09-30 08:49:00 +00:00
elexis 218399bf3d Rename JSInterface_GUITypes to JSInterface_GUISize, refs 8734efca94, 9be8a560a9.
Rename init to RegisterScriptClass.

Differential Revision: https://code.wildfiregames.com/D2339
Tested on: clang 8.0.1., Jenkins/vs2015

This was SVN commit r23018.
2019-09-30 08:19:56 +00:00