Commit Graph

20375 Commits

Author SHA1 Message Date
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
968a208ac0 Remove transparency from horses bodies.
This was SVN commit r23444.
2020-01-26 17:01:56 +00:00
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
1bcc38242d Update roman civic center to use less transparency.
This was SVN commit r23442.
2020-01-26 16:59:02 +00:00
9abe10c42a Remove some transparency from helmets.
This was SVN commit r23441.
2020-01-26 16:57:36 +00:00
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
ba0eef2003 Remove basic_trans from greaves to improve performance.
This was SVN commit r23439.
2020-01-26 16:53:48 +00:00
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
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
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
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
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
ed0a3f4290 Fix two incorrect icons.
Noticed by: @Nescio
Refs: 702d92ec86

This was SVN commit r23428.
2020-01-20 22:58:36 +00:00
f9b0d5e365 Use a non transparent material to improve performance.
This was SVN commit r23427.
2020-01-20 22:13:27 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
fedcc2f0f1 Delete two unused old icons.
Refs: P194

This was SVN commit r23402.
2020-01-15 15:46:53 +00:00
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
f82fd8ed5c Fix lineendings.
This was SVN commit r23400.
2020-01-15 13:24:17 +00:00
b59257a53f Nerf citizen javelinist team bonuses, because they allowed too quick reinforcements and economy boom.
Differential Revision: https://code.wildfiregames.com/D2392
Patch By: ValihrAnt
This was SVN commit r23399.
2020-01-15 12:06:21 +00:00
cca241c322 Fix some oversights in the gamesetup class rewrite 34138a7764/D2483 and one in the landscape gamesetup option D2564/af15d5972d.
* Relic count setting didn't work at all, reported by gameboy.
* GameSettingsPanel columnWidth wasn't lowered when using 1024*768,
necessary when all victory conditions are enabled (two columns),
reported by bb.
* Landscape setting didn't work with the random random map, reported by
bb.
* SavegameDetails used an obsolete function name.

This was SVN commit r23398.
2020-01-15 11:51:42 +00:00
193e607677 gui/manual/intro.txt interpunction
This patch is split from D2305. It does the following:
* replace programmer's quotes () in text with proper opening and closing
quotation marks ()
* start sentences with a capital
*  →
* remove an incorrect colon ()
* use imperative

Author: Nescio

Reviewed By: Gallaecio, Freagarach
Differential Revision: https://code.wildfiregames.com/D2560
This was SVN commit r23397.
2020-01-15 09:42:28 +00:00
49415f8716 Splits debug display of frustums for an easier debugging of a culling and shadows
This was SVN commit r23395.
2020-01-14 23:51:29 +00:00
dc56447328 Optimize resource trickle by not running timers when not necessary.
Reviewed by: @bb
Comments by: @Freagarach
Differential Revision: https://code.wildfiregames.com/D2400
This was SVN commit r23394.
2020-01-14 21:48:32 +00:00
bb
a852bffeaa Standardize modmod buttons width
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D2569
This was SVN commit r23393.
2020-01-14 21:02:48 +00:00
af15d5972d Landscape and Daytime gamesetup options for the Unknown, Danubius and Polar Sea, refs #4838.
Allow gamesetup options other than biome to determine the map peview
image, refs #4962, 8adc6d8e93.
Add previews for the 12 Unknown, 2 Danubius and 2 Polar Sea variations.
Concludes deduplication of the Unknown (0d0bc32736), Unknown Land
(25682da568) and Unknown Nomad (7f8adcf8cb), refs #4317.

Differential Revision: https://code.wildfiregames.com/D2564
This was SVN commit r23392.
2020-01-14 07:02:40 +00:00
0307a642fe Fix gamesetup infinite loop when selecting a falsy (sandbox) AI difficulty following 34138a7764/D2483.
Correctly hide tips panel upon window resize.
Reported by Stan.

This was SVN commit r23391.
2020-01-14 05:46:37 +00:00
c926b53917 Optimize some props by not using transparency.
Noticed by: @vladislavbelov
This was SVN commit r23390.
2020-01-13 23:26:43 +00:00
c942189aac Optimize some helmets by not using transparency when not necessary. EOL
Noticed by: @vladislavbelov
This was SVN commit r23389.
2020-01-13 23:25:56 +00:00
69258604cc Optimize some structures, by not using transparency when not necessary. EOL
Noticed by: @vladislavbelov
This was SVN commit r23388.
2020-01-13 23:24:55 +00:00
bb
79cbb95d12 Move the credits button on main menu
Patch By: Nescio
Comments By: Stan
Differential Revision: https://code.wildfiregames.com/D2430
This was SVN commit r23387.
2020-01-13 18:33:03 +00:00
b0b2f0701d Credit Inari in the credits instead of the commit message of dbb69285a5.
This was SVN commit r23385.
2020-01-13 07:47:30 +00:00