1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-27 00:41:08 +02:00
Commit Graph

4220 Commits

Author SHA1 Message Date
e6afd8621c Minor improvements & fixes to music player
- music will be selected correctly after rapid leaving and reentering
town screen
- music sets are now store as single std::map instead of unnecessary
"map of maps"
- fixed computation of resume time for restarted/looped music tracks
- updated & clarified some comments
- converted C functions for SDL_Mixer callbacks into lambdas
- formatting fixes
2022-11-21 16:20:20 +02:00
584f6a6230 Update lib/CArtHandler.cpp
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-11-20 10:15:57 +02:00
4b52d38c57 artifact assemble fixed 2022-11-19 16:35:06 +02:00
e6e669d024 ArtifactUtils::isSlotBackpack() func + refactoring 2022-11-18 23:13:44 +02:00
30bbb57619 Apply suggestions from code review
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-11-18 22:15:03 +02:00
625c18a889 Fix #3234 2022-11-18 04:05:35 +04:00
e9ab894638 backpack assemble 2022-11-18 01:55:29 +02:00
2d078132bf assemble in backpack initial 2022-11-17 19:43:54 +02:00
a65dd0726d Separated siege-related part of BattleInterface into separate class
- added constants for BattleHex'es of castle towers
2022-11-17 18:50:12 +02:00
bd1b2e4977 Battle Interface refactoring: separated projectile handling into a
separate class (untested)
2022-11-17 13:21:03 +02:00
1893212abb Merge pull request #1146 from IvanSavenko/ray_projectile
Implemented ray-like projectiles for shooters
2022-11-16 22:45:00 +04:00
1bdc4240d1 Remove unused include 2022-11-16 12:16:23 +02:00
6678a747bb Implemented ray-like projectiles for shooters
- Added missing support for ray-like projectiles
- Archmages, Evil Eyes and Beholders now use ray for shooting
- New method to draw 1 pixel-wide line with color gradient at arbitrary
angle
- fixed incorrect attackClimaxFrame field for Archmages
2022-11-15 21:42:16 +02:00
6974d4ea53 Merge pull request #1130 from IvanSavenko/banned_skills_fix
Fixes #1096 - do not propose banned skills on levelup
2022-11-15 09:32:12 +02:00
8b964be71f Merge pull request #1111 from GermanAizek/develop
Code refactor and fix condition bug
2022-11-15 09:23:16 +02:00
7fdad4e0f6 Code refactor following C++ standard and condition fixes 2022-11-15 03:20:55 +03:00
729357824b Added common method for secondary skill availability checks 2022-11-14 19:08:49 +02:00
e06db2365d Fixes #1096 - do not propose banned skills on levelup
Remove possibility to get banned skill on levelup as "obligatory skill"
if all other such skills have been learned before.

May happen under some conditions, e.g. if hero quickly learns other
magic schools - in witch hut/university, leading to case where banned
skill is the only obligatory skill that can be offered on levelup
2022-11-14 17:16:49 +02:00
86972d7164 Merge pull request #1112 from SoundSSGood/bulk-move-swap-artifacts-rev2
Bulk move and swap artifacts rev2
2022-11-14 08:31:48 +02:00
98bf6931a1 cosmetic correction 2022-11-13 19:01:28 +02:00
57ab13c820 cosmetic correction 2022-11-13 17:09:48 +02:00
f9738f0d0b nullptr checks 2022-11-13 16:28:26 +02:00
aef87dd482 Apply suggested cosmetic changes 2022-11-13 15:28:09 +02:00
84841a5f0a BulkMoveArtifacts::applyGs reworked 2022-11-12 19:44:34 +02:00
6e5932c016 Apply suggested changes next part 2022-11-10 21:02:06 +02:00
ad47a7573c Code style. Typo. Code clean up. 2022-11-10 18:29:39 +02:00
b9087e2d63 Apply suggestions from code review
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-11-10 17:45:54 +02:00
1ca2283a90 Merge pull request #1105 from krs0/feature/#1071__In_latest_night_builds_there_are_problems_with_schema_obstacle.json_and_file_obstacles.json
Problems with schema obstacle.json and file obstacles.json #1071
2022-11-10 11:53:08 +02:00
5f92a0760f Merge pull request #1113 from vcmi/nk-fix-hung
NKAI: a few crash/hang fixes
2022-11-10 11:48:17 +02:00
3a3b559a0b attempt to fix the build 2022-11-07 14:20:28 +02:00
203c54e956 BulkMoveArtifacts structure optimization 2022-11-07 14:13:36 +02:00
233b850daf NKAI: a few crash/hang fixes 2022-11-07 13:58:20 +02:00
0032947735 regression fixed. Artifact assemble dialog shows multiple times. 2022-11-07 00:36:13 +02:00
f72a3e3884 function ArtifactUtils::checkSpellbookIsNeeded for the artifacts like a Titan's thunder 2022-11-07 00:18:05 +02:00
95ab343116 Net Packs BulkMoveArtifacts structure and BulkMoveArtifacts::applyCl 2022-11-06 23:54:50 +02:00
d0895e30ef callback functions and cleaning up unused code 2022-11-06 23:41:29 +02:00
363e461c3e ArtifactUtils and CArtifactFittingSet class 2022-11-06 23:29:22 +02:00
0f35082024 Fix crash with objects belonging players without state 2022-11-06 03:26:13 +04:00
krs
aab394ff93 #1071 - In latest night builds there are problems with schema obstacle.json and file obstacles.json 2022-11-04 00:06:15 +02:00
7618bc7425 Mantis-2934: fix conditions to upgrade town in h3m format parser 2022-10-23 16:40:07 +03:00
601ced3749 BattleAI: rework movement when no targtes 2022-10-23 11:41:03 +03:00
b43e0ff9e4 Merge pull request #972 from vcmi/cpp-map-editor
Cpp map editor
2022-10-22 12:42:27 +03:00
750f160276 Fix advmap spell mechanics 2022-10-20 22:34:27 +04:00
c32d44190e Merge pull request #1075 from Nordsoft91/town-entrance-fix
[1069] Fix bug related to town entrance
2022-10-19 13:42:33 +03:00
288f36c0c3 Merge pull request #1052 from Nordsoft91/mp-disconnection
MP handle disconnection
2022-10-19 09:56:18 +03:00
7bcb318593 Fix bug related to town entrance 2022-10-19 02:54:06 +04:00
0adae7bb0d Revert "Fix crash for disconnecting client"
This reverts commit 28ab1e9777.
2022-10-19 00:14:16 +04:00
d5403d3eb9 Merge remote-tracking branch 'upstream/develop' into cpp-map-editor 2022-10-17 01:39:11 +04:00
82a9f82e1c BattleAI: retreat 2022-10-14 12:00:56 +03:00
6cbaa40e29 #1065 - fix random hero initial position 2022-10-13 11:58:32 +03:00