Commit Graph

20388 Commits

Author SHA1 Message Date
vladislavbelov b42ebe99f5 Fixes commented block introduced in ecc7d2913e.
Noticed By: Stan
This was SVN commit r23463.
2020-01-29 23:44:14 +00:00
vladislavbelov ecc7d2913e Moves GL error check after SwapBuffers to decrease a possible synchronization during rendering process.
Comments By: Stan, elexis
Differential Revision: https://code.wildfiregames.com/D2600
This was SVN commit r23462.
2020-01-29 22:03:44 +00:00
elexis 1fdcb80850 Buff loom to double female citizen HP.
Differential Revision: https://code.wildfiregames.com/D2587
Patch By: ValihrAnt
This was SVN commit r23461.
2020-01-29 18:57:30 +00:00
elexis 5fe58d80fd Some more random random map script unit tests and ASSERT functions, refs #4827.
Differential Revision: https://code.wildfiregames.com/D2603
This was SVN commit r23460.
2020-01-29 18:52:48 +00:00
vladislavbelov 8ea416b125 Adds an option to enable/disable building snapping by a hotkey.
Comments By: elexis, bb
Differential Revision: https://code.wildfiregames.com/D2546
This was SVN commit r23459.
2020-01-29 17:41:39 +00:00
vladislavbelov 936cf78ac1 Adds tests for terrain resize, it helps to describe the exact behavior of height preserving.
Reviewed By: Stan
Differential Revision: https://code.wildfiregames.com/D2604
This was SVN commit r23457.
2020-01-29 16:01:25 +00:00
elexis 0a6db43c83 Support random map script tests, fixes #4827.
Differential Revision: https://code.wildfiregames.com/D2085
Comments By: wraitii
This was SVN commit r23455.
2020-01-29 00:30:07 +00:00
Angen 67a4c18c74 Disband formation instead destroying
Fix missed line change in 9c2e9d7893 when rebasing D1462

This was SVN commit r23454.
2020-01-28 19:31:04 +00:00
elexis f98cbb290a Support GUI script includes in included XML files to further decoupling of GUI page contents, refs #5387.
Differential Revision: https://code.wildfiregames.com/D2599
Comment By: Stan, Vladislav
This was SVN commit r23452.
2020-01-28 01:06:34 +00:00
Stan dbdd1dc01b Fix a typo and a duplicated prop noticed by @elexis and checkrefs.pl. Remove a duplicated sail prop.
This was SVN commit r23451.
2020-01-27 22:50:38 +00:00
Angen 9c2e9d7893 Enforce formation required member count
Disband formation with less memebers than required.
Do not allow one member in formation.
Show only formations entities actually are allowed to form. (do not show
wedge for infantry)

Differential Revision: https://code.wildfiregames.com/D1462
Fixes: #5119
Comments by: elexis, bb, temple, Stan, Freagarach
This was SVN commit r23450.
2020-01-27 17:49:06 +00:00
Angen 17c9950cee Fix entities not retaining repair order after target transforms
Update this.repairTarget in UnitAI when target renames.
Transfer builders among renamed entities.

Differential Revision: https://code.wildfiregames.com/D2360
Patch by: @Freagarach
Comments by: Stan, elexis
This was SVN commit r23449.
2020-01-27 17:14:30 +00:00
Angen 82a5ab6d19 Allow status effect to apply modifiers and fix 2333b1814e
Status effect can apply modifier to the entity (armour strength, walking
speed, ...)
This is also hiding status effect icons by default in selection detail.
Fixing smaller related bugs.

Differential Revision: https://code.wildfiregames.com/D2281
Patch by: @Freagarach
Comments by: Stan, wraitii
This was SVN commit r23448.
2020-01-27 16:51:25 +00:00
vladislavbelov 95b13cda13 Adds const to Material and CShaderProgram::Binding methods, removes a redundant variable from ModelRenderer
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D2598
This was SVN commit r23445.
2020-01-26 21:32:12 +00:00
Stan 968a208ac0 Remove transparency from horses bodies.
This was SVN commit r23444.
2020-01-26 17:01:56 +00:00
Stan 8954dbd110 Update the siege engines to not use transparency where not necessary.
This was SVN commit r23443.
2020-01-26 17:00:55 +00:00
Stan 1bcc38242d Update roman civic center to use less transparency.
This was SVN commit r23442.
2020-01-26 16:59:02 +00:00
Stan 9abe10c42a Remove some transparency from helmets.
This was SVN commit r23441.
2020-01-26 16:57:36 +00:00
Stan 993dd3a958 Update persian merchant ship mesh to reduce the amount of transparency.
This was SVN commit r23440.
2020-01-26 16:56:39 +00:00
Stan ba0eef2003 Remove basic_trans from greaves to improve performance.
This was SVN commit r23439.
2020-01-26 16:53:48 +00:00
elexis c3a263f1d7 Fix Danubius triggerscript warnings when playing with DisabledTreasures following 6113edd746, reported by mord and nani.
Differential Revision: https://code.wildfiregames.com/D1690
Reviewed By: bb
This was SVN commit r23438.
2020-01-26 16:29:52 +00:00
elexis ccea97670e CSlider inherits IGUIButtonBehavior to gains button sounds, press/release events, duplication removal, continuation of sliding if the object is not hovered while the button is still pressed, refs #2593, c016a74309/D325, 359df88f1a/D1622.
Use the events to fix jittering of the gamesetup slider in
multiplayermode, refs 352d4ea78f/D2571.

Differential Revision: https://code.wildfiregames.com/D2592
Reviewed By: nani
Comments By: Vladislav
This was SVN commit r23435.
2020-01-24 00:56:51 +00:00
elexis 8e3f6439db Gamestup option to select the time the sea level starts to rise on Extinct Volcano (and other maps thay may want to use it), refs #4838.
Differential Revision: https://code.wildfiregames.com/D2593
This was SVN commit r23434.
2020-01-23 15:58:35 +00:00
bb 33365b6392 Remove trailing 0's from Armour items in templates
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D2280
This was SVN commit r23432.
2020-01-22 22:23:16 +00:00
bb 0cf8d207fb Merge kushites champion infantry attack bonusses
Patch By: Freagarach
Differential Revision: https://code.wildfiregames.com/D2262
This was SVN commit r23431.
2020-01-22 22:13:43 +00:00
elexis 352d4ea78f Gamesetup slider support, use it for Ceasefire, RelicCount, RelicDuration, WonderDuration.
Use Math.round until the slider GUI object type supports fixed step
sizes, refs D406.

Differential Revision: https://code.wildfiregames.com/D2571
Comments By: Vladislav (irc), nani (PM), bb (irc), Stan
This was SVN commit r23430.
2020-01-22 21:37:14 +00:00
elexis c50a621cea Disable Quicksave during multiplayer, since the feature is not implemented and triggering it can crash the turnmanager.
Differential Revision: https://code.wildfiregames.com/D2584
Comments By: Stan
This was SVN commit r23429.
2020-01-22 14:05:17 +00:00
Stan ed0a3f4290 Fix two incorrect icons.
Noticed by: @Nescio
Refs: 702d92ec86

This was SVN commit r23428.
2020-01-20 22:58:36 +00:00
Stan f9b0d5e365 Use a non transparent material to improve performance.
This was SVN commit r23427.
2020-01-20 22:13:27 +00:00
vladislavbelov 365e6c58e8 Removes unused gfx::GetMonitorSize function
GetMonitorSize was added in 5b5726ed4d. Its usage wasn't added. We don't
need to have the custom implementation of the function, since SDL2 can
do this. Also it doesn't make sense to get the default monitor size in
multi-monitor environments since the application window might be located
on each of them.

Patch By: linkmauve
This was SVN commit r23426.
2020-01-20 21:54:31 +00:00
vladislavbelov 421124d486 Removes unused MemorySizeMiB. Refs D2476.
We don't need to account #2145 anymore, since we dropped SDL1. SDL2
doesn't have SDL_GetVideoInfo. We might use OpenGL extensions like
GL_ATI_meminfo, GLX_MESA_query_renderer or GL_NVX_gpu_memory_info.
But they aren't spreaded very well. Also VRAM size isn't so useful for
us, since OpenGL driver can swap memory pages when it needs to.

Patch By: linkmauve
This was SVN commit r23425.
2020-01-20 21:24:09 +00:00
vladislavbelov 32b52f9f67 Saves sidebar/bottombar width/height between Atlas sessions
Tested By: Nescio, Stan
Differential Revision: https://code.wildfiregames.com/D2583
This was SVN commit r23424.
2020-01-20 20:58:17 +00:00
vladislavbelov d3328f9358 Adds non-strict search to the Atlas entity list
Tested By: Nescio, elexis, Stan
Differential Revision: https://code.wildfiregames.com/D2542
This was SVN commit r23423.
2020-01-20 20:42:54 +00:00
Stan 702d92ec86 Delete duplicate and deprecated unit icons.
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2586
This was SVN commit r23422.
2020-01-20 18:37:05 +00:00
Stan d584d2dcde Update hero icons and names
→ sets a generic icon (the golden laurel wreath) in
template_unit_hero.xml
→ removes icons from hero templates that used one belonging to another
hero
→ corrects hero icons, generic names, and specific names where necessary

Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2582
This was SVN commit r23421.
2020-01-20 14:02:32 +00:00
elexis 02f39840c2 Show an error message instead of triggering a debug breakpoint if a GUI page attempts to include a directory or file from an invalid path.
Differential Revision: https://code.wildfiregames.com/D2363
Patch By: nani
This was SVN commit r23420.
2020-01-20 09:58:03 +00:00
elexis 5ca68a38ef Rewrite Gamesetup AIConfig page to use class syntax, decouple settings and move it to the Gamesetup subfolder context, refs #5322, #5387.
This establishes a code architecture where only one class and only one
page is responsible per AI setting,
removes the hardcodings from the XML and JS file,
allowing future patches and mods to insert, remove and edit independent
AI settings without having to overwrite the existing code.

Differential Revision: https://code.wildfiregames.com/D2577
See also 0550315161/D2581 and comments linked there.

This was SVN commit r23419.
2020-01-20 09:29:43 +00:00
Angen d33f1c7321 Remove not needed checks and code for VS2015 [VS2013 -> VS2015]
Some pragma warnings are not more needed for VS2015 compilation this
removes them.
Removing some specific code for older version than VS2015.
Forcing build to fail if compiling with VS older than VS2015.

Differential Revision: https://code.wildfiregames.com/D1396
Reviewed by: @Itms
This was SVN commit r23416.
2020-01-19 12:43:41 +00:00
elexis 63d8d579d7 Options page dropdown support for per-value hovered tooltips.
Differential Revision: https://code.wildfiregames.com/D2576
Preparation for: D2546
Accepted By: Vladislav
This was SVN commit r23414.
2020-01-18 20:40:33 +00:00
elexis 0550315161 Gamesetup subpages support.
Split SetupWindow from GameSetupPage class.
Create Gamesetup/Pages subfolder, starting with the existing
GameSetupPage and LoadingPage.
Run the subpage in the same GUI script context instead of separate
pages.
Planned subpages are AIConfigPage (refs D2577), MapBrowser (D1703), hero
selection dialog, civ selection (refs #3987), starting resources,
population capacity (refs #4379, #812...).

This allows:
- subpages to benefit from direct access and reuse of the gamesetup
controlers, (f.e. gameSettingsControl, playerAssignmentsControl,
mapCache, netMessages, ...), deduplication.
- subpages to handle events and control gamesettings even if the
according subpage is closed (for example deleting AIBehavior if there is
no AI assigned).
- to keep gamesettings decoupled, i.e. exactly one class per setting
(for this example avoiding that both GameSetupPage/AIConfigButton and
AIConfigPage/AIBehavior control the AIBehavior setting value.).

Differential Revision: https://code.wildfiregames.com/D2581
Comments By: Vladislav
(http://irclogs.wildfiregames.com/2020-01/2020-01-18-QuakeNet-%230ad-dev.log),
nani (PM)

This was SVN commit r23413.
2020-01-18 19:42:58 +00:00
vladislavbelov 7c72cb7bb9 Reports SDL builtin and runtime versions and video backend in hwdetect report.
Patch By: linkmauve
Differential Revision: https://code.wildfiregames.com/D2485
This was SVN commit r23412.
2020-01-18 16:45:50 +00:00
vladislavbelov 1750b0b34c Fixes GLES mode builds on Mesa and running on Intel Iris drivers.
Patch By: linkmauve
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D2448
This was SVN commit r23410.
2020-01-17 21:13:51 +00:00
Angen 220f1be652 Allow to garrison animals.
Implementing decision to let animals garrison taken on irc
http://irclogs.wildfiregames.com/2013-12/2013-12-03-QuakeNet-%230ad-dev.log
relevant for ticket #1907.

Differential Revision: https://code.wildfiregames.com/D1961
Patch by: @Freagarach
This was SVN commit r23409.
2020-01-17 09:40:34 +00:00
Angen 163d710952 Update auras when a formation member renames
Reported on forum:
https://wildfiregames.com/forum/index.php?/topic/25196-when-unit-levels-up-he-loses-armor-bonus-from-athens-hero/

Relevant diff: https://code.wildfiregames.com/D997

Differential Revision: https://code.wildfiregames.com/D1727
Patch by: @Freagarach
This was SVN commit r23408.
2020-01-17 09:32:52 +00:00
vladislavbelov df314f2974 Refactors Preprocessor testing and adds more tests
Reviewed By: Stan
Differential Revision: https://code.wildfiregames.com/D2574
This was SVN commit r23405.
2020-01-16 00:02:22 +00:00
Stan 215447a761 Upgrade the Ogre GLSL Preprocessor
Add #elif support and some fixes.

Reviewed by: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D2456
This was SVN commit r23404.
2020-01-15 18:20:36 +00:00
elexis eafd44cfc5 Remove counterproductive lowercasing of GUI ScriptEvent names, refs #127.
a8f48ff7e0 introduced XeroXMB lowercasing of element and attribute names
as a feature.
cf9d8b9797, 4d390f501c, dda6268466 added bugfixes and TODOs because of
that.
f76d0ffdc6, 44fe226dd2 removed the XeroXMB lowercase feature.
This patch removes the lowercasing GUI bugfixes that don't fix any bug
anymore while increasing code complexity and lowering performance
(string copies).

Do not send mouse coordinates objects for events that do not relate to
the mouse.

Store event names in static const members to:
(1) improve performance, ensuring that the CStr is not reconstructed
every call,
(2) obtain compile errors when misspelling event names,
(3) allow reuse of the strings in inherited and friend classes.

Differential Revision: https://code.wildfiregames.com/D2445
Comments by Matei, Philip on 2006-03-11-QuakeNet-#wfg-Meeting-0126.log
and 2006-06-24-QuakeNet-#wfg-Meeting-0139.log

This was SVN commit r23403.
2020-01-15 16:00:37 +00:00
Stan fedcc2f0f1 Delete two unused old icons.
Refs: P194

This was SVN commit r23402.
2020-01-15 15:46:53 +00:00
elexis f5808baac8 Don't continue to process pending netmessages in the gamesetup_mp page after having switched to the session page already.
If there was a player rejoining, a "start" and a "playerassignments"
message pending for that player, the playerassignments message would not
update the assignments of the session page, but the one of the obsolete
gamesetup_mp page, thus triggering "unknown player" messages for that
player during the session.
This seems to only happen when two players rejoin simultaneously and
with very rare timing / race condition, and thus was not reproducible
without modifying the code.
Issue since b454ccca79.

Differential Revision: https://code.wildfiregames.com/D2559
Should fix #5660.

This was SVN commit r23401.
2020-01-15 13:34:07 +00:00
elexis f82fd8ed5c Fix lineendings.
This was SVN commit r23400.
2020-01-15 13:24:17 +00:00