Ivan Savenko
82989e6302
Use pointers in containers to guaranteed fixed address
2023-09-04 18:56:16 +03:00
Ivan Savenko
a30e7ba321
Remove bitmasks of PlayerColor's. Add encode/decode methods
2023-09-04 18:56:16 +03:00
Ivan Savenko
3f921fa771
Serialization version bump
2023-09-04 18:22:34 +03:00
Ivan Savenko
6a260a60cf
Fix resource creation
2023-09-04 18:22:34 +03:00
Ivan Savenko
9cfcf5ea19
Fix regressions
2023-09-04 18:22:34 +03:00
Ivan Savenko
0f88b8969b
Removed some usages of std string as resource path
2023-09-04 18:22:34 +03:00
Ivan Savenko
8dfdfffd87
Use ResourcePath for audio files
2023-09-04 18:22:34 +03:00
Ivan Savenko
97b7d44c88
Use ResourcePath for video accessing
2023-09-04 18:22:34 +03:00
Ivan Savenko
6f0108e462
Use ResourcePath for referencing texts and json's
2023-09-04 18:22:34 +03:00
Ivan Savenko
823ffa7a07
Always use ResourcePath for referencing images and animations
2023-09-04 18:22:34 +03:00
nordsoft
d113168db4
Fix neutral objects serializing
2023-09-04 01:42:51 +04:00
nordsoft
385202a02a
Fix abandoned map crash
2023-09-04 01:42:51 +04:00
nordsoft
8040cafb3d
Code review tweaks
2023-09-01 15:17:46 +04:00
nordsoft
15037b782f
Fix assert
2023-09-01 04:39:32 +04:00
nordsoft
e9ba1d73d1
Support partial versions
2023-09-01 04:36:53 +04:00
nordsoft
ea7ab9d5ed
Migrate launcher to vcmi versions
2023-09-01 04:12:41 +04:00
Nordsoft91
c45ab07d0b
Merge pull request #2698 from Nordsoft91/turn-timer
...
Turn timer fixes
2023-09-01 00:31:52 +04:00
Konstantin P
08967efd91
Teleport: check immunities in applicable()
...
Attempt to fix #2677
2023-08-31 19:58:46 +03:00
Ivan Savenko
7255dda624
Merge pull request #2629 from dydzio0614/neutral-creature-popup
...
Improve neutral creature adventure map popup
2023-08-31 15:44:19 +03:00
Ivan Savenko
adb633be30
Merge pull request #2715 from IvanSavenko/regression_fix
...
Fix several recently discovered regressions
2023-08-31 15:41:04 +03:00
Nordsoft91
49614f5851
Merge pull request #2695 from Nordsoft91/mod-compatibility
2023-08-31 12:14:54 +04:00
Ivan Savenko
3e169ef2f5
Fix visiting of markets
2023-08-31 01:07:59 +03:00
nordsoft
cc3ca9a41e
Timers fixes
2023-08-30 03:33:59 +04:00
nordsoft
9a42abe2a7
Extended timer info to exhange between client and server
2023-08-30 03:11:46 +04:00
Ivan Savenko
695a51d8c8
Merge remote-tracking branch 'vcmi/beta' into develop
2023-08-28 21:19:53 +03:00
nordsoft
4ee47b01ae
Make possible to play with different timers independently
2023-08-28 19:45:15 +04:00
nordsoft
98f7ed9dfd
Implement player start turn query
2023-08-28 18:56:36 +04:00
nordsoft
93f14c984d
Fix compatibility check with patch version
2023-08-28 17:49:13 +04:00
nordsoft
925bde68ff
Fix compatibility check with game version
2023-08-28 17:43:33 +04:00
nordsoft
0a6ea63b09
Revert "Add compatibility with minor version"
...
This reverts commit 6e7b13fcbe
2023-08-28 17:41:00 +04:00
nordsoft
3962b71262
Remove unused variable
2023-08-28 17:10:52 +04:00
Nordsoft91
1586c6c6a0
Merge pull request #2668 from IvanSavenko/remove_current_player
...
Remove "currentPlayer" from gamestate
2023-08-28 17:10:28 +04:00
Nordsoft91
ffc4b989f0
Merge pull request #2679 from Laserlicht/smooth_scroll
...
Smooth scroll
2023-08-28 17:08:57 +04:00
nordsoft
6e7b13fcbe
Add compatibility with minor version
2023-08-28 16:21:46 +04:00
Ivan Savenko
ce20d913e0
Fix checking PlayerColor's for validness
2023-08-27 01:35:38 +03:00
Michael
2286e0c7b1
implement speed and move
2023-08-26 21:13:33 +02:00
Michael
fe6d96f4a0
angle calc
2023-08-26 20:19:25 +02:00
Ivan Savenko
edd029c79c
Replace "currentPlayer" from gamestate with "activePlayers"
...
- Allows multiple active players at once, e.g. simturns
- Cleared up validation of netpacks by server, e.g. always check for
pack sender
2023-08-25 18:56:15 +03:00
Ivan Savenko
b61c9a9e35
Fix build
2023-08-25 13:46:42 +03:00
Ivan Savenko
e2718db791
Converted several enumerations into constants
2023-08-25 13:38:02 +03:00
Ivan Savenko
c2d5f7f22f
Formatting & cleanup
2023-08-25 13:38:02 +03:00
Ivan Savenko
e54287ea5d
Converted remaining identifier to new system
2023-08-25 13:38:02 +03:00
Ivan Savenko
0240ee886d
Converted (almost) all namespace enum's to enum classes
2023-08-25 13:38:02 +03:00
Ivan Savenko
62cd8b12d4
Converted several namespace enums to enum class
2023-08-25 13:38:02 +03:00
Ivan Savenko
17d3d663ee
Converted creature ID and spell ID to new form
2023-08-25 13:38:02 +03:00
Ivan Savenko
ec8d31bbfc
First step at unifying game identifiers code
2023-08-25 13:38:01 +03:00
Ivan Savenko
b0eec85aca
Merge pull request #2632 from rilian-la-te/resist-rework-pt1
...
Spell resistance rework: part 1
2023-08-25 01:13:57 +03:00
Ivan Savenko
940bdcee3e
Fixes according to review
2023-08-24 23:34:33 +03:00
Ivan Savenko
f9410145d6
Fix handling of "7 days without town" loss condition
2023-08-24 23:34:33 +03:00
Ivan Savenko
ee8adbe85f
Update tavern on end of 7th turn of player in question
...
Allows removal of "retreat after 7th day" workaround and as result -
more straightforward code
2023-08-24 23:34:33 +03:00
Ivan Savenko
d83aa828f6
Fix turn ending
2023-08-24 23:34:33 +03:00
Ivan Savenko
c4bc6840ea
Moved management of turn order into a new class
2023-08-24 23:34:33 +03:00
Nordsoft91
979cf129bc
Merge pull request #2637 from Laserlicht/autosave
2023-08-25 00:09:49 +04:00
Michael
e317c23a59
fix
2023-08-24 20:31:06 +02:00
Michael
37e2292720
count unicode chars to extra function
2023-08-24 18:34:00 +02:00
Michael
485af4b4b5
avoid forbidden chars in path
2023-08-23 22:23:05 +02:00
Ivan Savenko
26bddbac44
Fix possible uncaught exception
2023-08-23 22:46:28 +03:00
Michael
b22a9ff2d0
Merge branch 'develop' into autosave
2023-08-23 21:39:04 +02:00
Michael
4784ae94b5
revert uuid
2023-08-23 20:03:40 +02:00
Ivan Savenko
4ab2e617d5
Fix infinite loop on Fear trigger
2023-08-23 19:34:33 +03:00
Ivan Savenko
81242d3500
Fixed ending of battles due to retreat/surrender
2023-08-23 18:46:56 +03:00
Konstantin
e6710a4eb0
vcmi: bump serialization version
2023-08-23 17:53:09 +03:00
Konstantin
d746a96d55
vcmi: use SpellSchool identifier instead of enum
...
Use identifier instead of enum inside callbacks. It is better and more
expandable solution.
2023-08-23 17:53:09 +03:00
Konstantin
75c39c6562
vcmi: handle icons for SPELL_DAMAGE_REDUCTION
...
For all schools and for ANY subtype
2023-08-23 17:53:09 +03:00
Konstantin
d20711bcd6
immunities: polishing
2023-08-23 17:53:09 +03:00
Konstantin
344593e891
vcmi: made some CSpell properties private
...
There are getters for it.
2023-08-23 17:53:08 +03:00
Konstantin
4d67a7e3d1
BonusParams: add XXX_IMMUNITY to deprecated
...
This bonuses does not exist now.
2023-08-23 17:52:16 +03:00
Konstantin
8724181a0f
vcmi: spell resistance rework
...
Now instead of XXX_IMMUNITY bonuses we have 2 bonuses with spellSchool
subtype: SPELL_SCHOOL_IMMUNITY and NEGATIVE_EFFECT_IMMUNITY.
All previous bonuses of subtype 0 is covered by SPELL_SCHOOL_IMMUNITY,
and all previous bonuses of subtype 1 is covered by
NEGATIVE_EFFECT_IMMUNITY. Unit tests are updated accordingly.
2023-08-23 17:52:16 +03:00
Konstantin
c9bc3fd4e1
CSpellHandler: use getBonusBearer
...
Use getBonusBearer method and cachingStr method for optimization
2023-08-23 17:52:16 +03:00
Ivan Savenko
a44c08a847
Slightly better thread names
2023-08-23 16:32:29 +03:00
Ivan Savenko
44d16b32fe
Use API identical to std classes where possible
2023-08-23 16:32:29 +03:00
Nordsoft91
1bad0e96ef
Merge pull request #2635 from Nordsoft91/loading-bar
...
Loading progress bar
2023-08-23 17:28:19 +04:00
Michael
d2bbe0f35a
starttime in foldername
2023-08-23 01:47:55 +02:00
Michael
538acfe3c0
Update StartInfo.h
...
fix
2023-08-23 01:08:57 +02:00
Michael
a0450d1363
format...
2023-08-23 00:39:09 +02:00
Michael
fed9ae5157
Merge branch 'develop' into autosave
2023-08-23 00:37:15 +02:00
Michael
51ba22a631
code review
2023-08-23 00:35:44 +02:00
Michael
68a1b883eb
autosave folders
2023-08-22 20:43:44 +02:00
nordsoft
dfaf778d16
Redesign loading solution
2023-08-22 20:10:20 +04:00
nordsoft
d50edc28ab
Merge remote-tracking branch 'upstream/develop' into turn-timer
...
# Conflicts:
# server/CGameHandler.cpp
# server/CGameHandler.h
2023-08-22 00:54:38 +04:00
nordsoft
dbc3a93013
Merge remote-tracking branch 'upstream/develop' into loading-bar
...
# Conflicts:
# server/CGameHandler.h
2023-08-22 00:46:54 +04:00
Dydzio
764608f100
Merge remote-tracking branch 'dydzio/configurable-autobattle-spells' into configurable-autobattle-spells
2023-08-21 20:10:04 +02:00
Dydzio
e81cd4e0e6
Delete empty file
2023-08-21 20:09:50 +02:00
nordsoft
45f13c7964
Progress update on client side
2023-08-21 19:21:27 +04:00
nordsoft
584dd20943
Progress on server side for rmg
2023-08-21 19:21:22 +04:00
Ivan Savenko
5f7f0ec2ea
Declare enum classes as int8_t
2023-08-21 17:55:49 +03:00
Ivan Savenko
67eaef3520
Fixed few more discovered regressions
2023-08-21 17:55:49 +03:00
Ivan Savenko
013417fb7e
Code cleanup
2023-08-21 17:55:49 +03:00
Ivan Savenko
c516b5a64e
Fixes for several discovered edge cases
2023-08-21 17:55:49 +03:00
Ivan Savenko
6297140bf5
Start of stabilization - battles now start correctly
2023-08-21 17:55:49 +03:00
Ivan Savenko
44832f3797
Split BattleProcessor into few more parts
2023-08-21 17:55:49 +03:00
Dydzio
ed12f20609
Improve neutral creature adventure map popup
2023-08-21 14:42:41 +02:00
Dydzio
78f56df44f
Comment out unused OH3 options so they do not clutter code suggestions
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-08-20 19:11:36 +02:00
Nordsoft91
ef4fddd0c4
Merge pull request #2570 from Laserlicht/town_selection_window
...
Town selection window
2023-08-20 17:37:45 +04:00
Dydzio
6bfbe80cc9
Allow toggling quick combat spells usage
2023-08-19 17:23:55 +02:00
Nordsoft91
4a6deedd5e
Merge pull request #2530 from Nordsoft91/tutorial
...
Support tutorial
2023-08-19 18:06:15 +04:00
Ivan Savenko
70ddc1f3e5
Merge pull request #2577 from wb180/secondarySkillSerialization
...
Preserve order of secondary skills during hero json serialization/deserialization
2023-08-18 15:24:02 +03:00
Ivan Savenko
d0b3319f6a
Merge remote-tracking branch 'vcmi/beta' into develop
2023-08-18 15:08:23 +03:00
Ivan Savenko
83b00bb7c3
Merge pull request #2610 from vcmi/master
...
Merge master -> beta
2023-08-18 12:56:05 +03:00
DjWarmonger
f9564dc8e4
Merge pull request #2563 from vcmi/fix_resources_near_mines
...
Fix resources placed behind mines
2023-08-18 09:12:56 +02:00
Michael
e1e16018d1
code review first batch
2023-08-17 17:29:31 +02:00
Ivan Savenko
daa8a494fc
Merge branch 'release_131' into master
2023-08-17 16:19:20 +03:00
Nordsoft91
96e820ddac
Merge pull request #2517 from Laserlicht/folders
2023-08-17 10:09:37 +04:00
Ivan Savenko
ef0cd0ba6e
Fixed mod dependencies check on save loading to prevent crashes:
...
- mods that don't affect game objects can be ignored when loading save
- gameplay-affecting mods that were present in save must be active
- gameplay-affecting mods that were not in save must not be active
2023-08-14 23:55:04 +03:00
nordsoft
d26fdaefe4
Battle timer
2023-08-14 23:31:44 +04:00
nordsoft
2ce50915e1
Fix ios compilation
2023-08-14 05:03:50 +04:00
nordsoft
3c9c302fd2
TurnTimerInfo
2023-08-14 02:16:25 +04:00
Michael
1d76f456ad
change servercode to make it more robust
2023-08-14 00:08:48 +02:00
Evgeniy Meshcheryakov
2a83f06905
Preserve order of secondary skills during hero serialization/deserialization
2023-08-14 00:06:22 +03:00
nordsoft
4b1224ec8c
Implement turn timer feature
2023-08-13 14:07:48 +04:00
Andrii Danylchenko
a7859dae39
Battle AI: archangels cast again
2023-08-13 09:08:30 +03:00
Ivan Savenko
f13a53c1d9
Merge remote-tracking branch 'vcmi/beta' into develop
2023-08-12 17:28:47 +03:00
Ivan Savenko
92ce97bbc7
Merge remote-tracking branch 'vcmi/master' into beta
2023-08-12 16:20:06 +03:00
Tomasz Zieliński
abacb5f0ea
Fix resources placed behind mines
2023-08-12 10:53:25 +02:00
Ivan Savenko
ccf31d19f8
Merge pull request #2558 from IvanSavenko/localization_fix
...
Do not ignore translations for maps & campaigns
2023-08-12 11:24:19 +03:00
DjWarmonger
654489d5d3
Merge pull request #2525 from vcmi/battle-fast-targets
...
Battle fast targets
2023-08-12 09:22:25 +02:00
DjWarmonger
917f846a3a
Merge pull request #2562 from vcmi/fix_artifact_replacement
...
Fix regression with replacing quest artifact
2023-08-12 09:14:21 +02:00
Michael
52f00ec308
extra function: getFormattedDateTime
2023-08-12 01:13:03 +02:00
Michael
4d507f3d8a
format fix
2023-08-12 00:00:35 +02:00
Michael
f0b60cf166
suggestions; use internally uppercase; fix; fullname
2023-08-11 23:56:20 +02:00
Tomasz Zieliński
4741bd546f
Fix regression
2023-08-11 20:13:25 +02:00
Tomasz Zieliński
8f450cf253
Fix for monsters spawning at left side of the map
2023-08-11 18:43:22 +02:00
Ivan Savenko
942f8bbf05
Fix possible access to non-existing building
2023-08-11 18:50:39 +03:00
Ivan Savenko
474045194a
Do not ignore translations for maps & campaigns
2023-08-11 16:12:02 +03:00
Tomasz Zieliński
83d97626fe
Merge remote-tracking branch 'origin/beta' into fix_rmg_object_pos
2023-08-11 10:58:26 +02:00
Ivan Savenko
b2de5d32d1
Merge pull request #2546 from vcmi/fix_crash_after_battle
...
Fix crash at battle end
2023-08-11 11:37:30 +03:00
Ivan Savenko
88b23cdce1
Merge pull request #2511 from IvanSavenko/fix_starting_army
...
Fix starting army
2023-08-11 11:36:30 +03:00
Tomasz Zieliński
0252d0f986
Fix hota offset + 2 possible crashes
2023-08-11 07:45:24 +02:00
DjWarmonger
f5926c4023
Merge pull request #2498 from vcmi/fix_roads_in_rock
...
Fix placing road inside underground rock
2023-08-11 07:22:36 +02:00
Michael
2b093b8850
case handling
2023-08-11 01:46:22 +02:00
Tomasz Zieliński
84436f7f18
Throw runtime error explicitely
2023-08-10 18:29:49 +02:00
Tomasz Zieliński
f483f7bb53
Fix crash at battle end
2023-08-10 11:52:31 +02:00
Ivan Savenko
1f9ee6aa38
Merge pull request #2524 from Nordsoft91/reward_canrefuse
...
[1.3.1] Reward can refuse fix
2023-08-09 20:06:26 +03:00
nordsoft
1def98a862
Tutorial implemented
2023-08-09 03:54:09 +04:00
Andrii Danylchenko
ba9998ac66
BattleAI: fast targets optimization
2023-08-08 20:10:29 +03:00
nordsoft
be6f6da397
Fix for canRefuse flag in rewardable building
2023-08-08 19:27:00 +04:00
Ivan Savenko
2e7e8bb52b
Better error message on missing object constructor
2023-08-08 12:50:39 +03:00
Ivan Savenko
e57f8742cd
Rename ambiguos 'clear' to 'clearSlots'
...
A lot of map objects inherit from CCreatureSet and as result - get
clean() method that resets object army
2023-08-07 19:13:02 +03:00
Ivan Savenko
f0ede46186
Clear spell list, not hero army
2023-08-07 19:12:04 +03:00
Michael
a9e895c08f
basic subdirectory support
2023-08-06 21:39:39 +02:00
Tomasz Zieliński
c089e55893
Fix placing road inside underground rock
2023-08-06 21:14:16 +02:00
Ivan Savenko
c524caee5c
Fixed possible uncaught exception on starting map
2023-08-06 17:46:49 +03:00
Ivan Savenko
8b0f9c86f8
Fixed possible crash on invalid town building name
2023-08-06 13:30:20 +03:00
Ivan Savenko
041236837b
Possible fix for crash from Android crash reporting
2023-08-05 12:49:38 +03:00
Ivan Savenko
dd17896082
Fix crash on bonus parsing failure (outdated mods?)
2023-08-05 12:49:02 +03:00
Ivan Savenko
ad8695ac91
Fix saving games - regression from filesystem changes
2023-08-04 18:41:42 +03:00
Ivan Savenko
537f9fa048
Merged master into develop
2023-08-03 23:38:32 +03:00
Tomasz Zieliński
44fae4945d
Update distances in all zones adjacent to object
2023-08-02 20:41:29 +02:00
DjWarmonger
ca0eacc283
Merge pull request #2458 from vcmi/fix_water_tavern
...
Fix crash at water tavern
2023-08-02 20:03:02 +02:00
Tomasz Zieliński
250b27ba46
Fix crash due to missing boat for neutrla heroes
2023-08-02 17:19:23 +02:00
