games/vcmi
1
0 Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
21,177 Commits 30 Branches 75 Tags
4f6a4c50530a69ef10c0e56445c653d07af1805c
Commit Graph
960 Commits
Author SHA1 Message Date
Nordsoft91 3951bbb395 Merge pull request #1108 from Nordsoft91/battle-dialog 
[HDMod features] Quick combat
 2023-04-11 21:18:04 +04:00
Ivan Savenko dfa2e2a349 Merge beta into develop 2023-04-11 19:37:35 +03:00
nordsoft bfc75ccd39 Merge remote-tracking branch 'upstream/develop' into battle-dialog 2023-04-11 02:22:42 +04:00
Ivan Savenko e2d0cd37e4 Merge pull request #1910 from IvanSavenko/beta_fixes 
Fixes for 1.2 branch
 2023-04-09 20:09:03 +03:00
Adriankhl 1d6192ca62 Shut down the thread for tactic phase properly 2023-04-08 22:52:46 +04:00
nordsoft 50115c3113 Rename variables 2023-04-08 20:56:05 +04:00
Ivan Savenko 3dedc963f7 Fix double-playing of battle effects 2023-04-08 18:53:28 +03:00
SoundSSGood e58be8e7f7 vcmiartifacts fixed 2023-04-08 12:28:53 +03:00
nordsoft e85593dbb3 Save & restore mana 2023-04-06 21:19:46 +04:00
nordsoft ce3028bd73 Intermediate commit 2023-04-06 19:34:07 +04:00
Ivan Savenko 307065a633 Merge beta into develop 2023-04-04 16:06:20 +03:00
Ivan Savenko c661419897 Merge pull request #1700 from rilian-la-te/resource-array 
Modernize resourceSet.
 2023-04-02 20:12:45 +03:00
Konstantin eff41f66ed vcmi: now obstacles can have disappearing anim 
It is a reverse version of appearingAnimation.
 2023-03-31 01:01:25 +03:00
Ivan Savenko 0c023347dd Fix potential nullptr dereference 2023-03-28 23:50:57 +03:00
Ivan Savenko b875da108b Merge pull request #1717 from SoundSSGood/backpack-limit-size 
Introducing backpack size limit functionality
 2023-03-27 17:17:49 +03:00
Ivan Savenko 8af76947cb Do not cache hovered tile and always update state 2023-03-22 19:49:57 +02:00
Ivan Savenko fa9abf6adc Lock UI while adventure map has animations 2023-03-22 19:49:24 +02:00
Ivan Savenko c81d57ab8c Remove excessive totalRedraw's 2023-03-22 00:57:08 +02:00
SoundSSGood 19096f39f0 Backpack limit. Amount of fixes. 2023-03-21 22:11:42 +02:00
Ivan Savenko bb03abdce6 Fix crash on switching players in hotseat 2023-03-21 19:06:38 +02:00
SoundSSGood 96e8a1f21c Backpack limit part1 (move, disassemble) 2023-03-21 12:14:33 +02:00
Konstantin bbbbfe00f0 Modernize resourceSet 2023-03-17 02:26:54 +03:00
Ivan Savenko 39f2bef1ab Update town visual on capturing 2023-03-15 00:30:58 +02:00
Ivan Savenko 844bf9b9ab Do not play embark/disembar sound during enemy turn 2023-03-15 00:30:19 +02:00
Ivan Savenko f988a67fbf Fix movement animation on revealing FoW 2023-03-15 00:29:12 +02:00
Konstantin b4940ee247 vcmi: allow showing no more than 8 components 
In InfoWindow there is no place for more than 8 components.
Better to have more annoying windows than window which cannot be closed

Slider may be better of course, but I cannot do it for now.
 2023-03-13 00:24:26 +03:00
Konstantin 4df4a872c0 showInfoDialog: fix waitWhileDialog regression 2023-03-12 15:01:48 +03:00
Konstantin 3d33da0a9e vcmi: request pop all when hero is moved 
This way new pickup will show immidately.
 2023-03-11 21:41:57 +03:00
Konstantin bc228a938a vcmi: use enum class for EComponentType 
There is really no reason not to use it
 2023-03-11 21:41:57 +03:00
Konstantin a6cb7fd192 vcmi: allows to more than 8 components in infobar 2023-03-11 21:41:57 +03:00
Konstantin a0c644a0e5 vcmi: actually implement AUTO for CInfoWindow 
This is possible to use infobar interactions now.
 2023-03-11 21:41:57 +03:00
Konstantin 4617ce10e5 vcmi: allow showing more than one components in infobar 
Up to 8, AFAIK. So, we can show multi-reward in infobox now.
One issue remain - cannot dynamically choose components size
based on text size.
 2023-03-11 21:41:57 +03:00
Konstantin 2fb2a79ca4 vcmi: fix components other than resources in infobar 
Do not redraw infobar when components shows and
we request to show current adventure hero.
Player already knows which hero he used to pick up
components.
 2023-03-11 21:41:57 +03:00
Konstantin 5366f9190e vcmi: reduce boost::lexical_cast usage 2023-03-09 16:36:46 +03:00
Ivan Savenko df4fe33c3a Do not switch InfoBar to hero during another player turn 2023-03-07 00:06:58 +02:00
Ivan Savenko 30911eb593 Lock UI during movement animation 2023-03-05 18:02:59 +02:00
Ivan Savenko b57a07b10f Restored ambient sounds functionality 2023-03-05 18:02:59 +02:00
Ivan Savenko cdcd5a29dd Updated path to renamed directory 2023-03-05 18:02:59 +02:00
Ivan Savenko 387a7b421a Refactoring of new code, multiple functionality changes: 
- Implemented separate Map View contexts for different map modes
- Puzzle map now works
- Enemy movement now works as in H3
- Removed no longer used code
- Implemented missing embark/disembark sounds
- Fixed view focusing on embarking/disembarking
- Fixed focusing on movement near edge of terra incognita
- Fixed sea movement sound
 2023-03-05 18:02:58 +02:00
Ivan Savenko 46200b133f Remove default parameter 2023-03-05 17:57:36 +02:00
Ivan Savenko 45e2875342 Completely removed old TerrainRect class 2023-03-05 17:57:36 +02:00
Ivan Savenko fbb8c18c23 Improved map view selection tracking 2023-03-05 17:57:36 +02:00
Ivan Savenko 5905dd6111 Grail digging check is now in library 2023-03-05 17:48:02 +02:00
Ivan Savenko 11e4d84749 Implemented View Earth / View Air spells 2023-03-05 17:48:02 +02:00
Ivan Savenko ec6f19ea18 Code reorganization, no changes to functionality 2023-03-05 17:48:02 +02:00
Ivan Savenko ca13e7dedf Implemented terrain palette animatiions. Removed old code 2023-03-05 17:48:02 +02:00
Ivan Savenko 7cf00ba87d Implemented basic hero movement animation & object fade-out 2023-03-05 17:48:02 +02:00
Ivan Savenko 4501036a04 Basic version of hero movement on map. Removed old code. 2023-03-05 17:48:02 +02:00
Ivan Savenko d46687a9c8 Partial implementation of world view mode 2023-03-05 17:48:02 +02:00
Ivan Savenko 600054e001 Refactored access to hero paths in CPlayerInterface 2023-03-05 17:48:01 +02:00