games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity
12,621 Commits 19 Branches 62 Tags 110 MiB
cab2bddf7e
Commit Graph

12621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Savenko
bdd5848541
Merge pull request #2654 from IvanSavenko/regression_fix 
Regression fix
 2023-08-24 02:01:14 +03:00
Michael
e6f1677d3a
missing header... 2023-08-23 23:34:33 +02:00
Michael
9f68a0bf49
avoid destroing utf-8; no extra Autosave text 2023-08-23 23:25:48 +02:00
Michael
485af4b4b5
avoid forbidden chars in path 2023-08-23 22:23:05 +02:00
Ivan Savenko
a84c5fa371 Fix battle replaying 2023-08-23 22:46:42 +03: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
1586b9fbd1
possibility to restart 2023-08-23 21:37:44 +02:00
Ivan Savenko
dd8a59fa86
Merge pull request #2638 from IvanSavenko/battle_processor_regression_fix 
Battle processor regression fix
 2023-08-23 21:03:58 +03: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
a5501abd01 Fix skipping battle intro via click 2023-08-23 18:46:56 +03:00
Ivan Savenko
81242d3500 Fixed ending of battles due to retreat/surrender 2023-08-23 18:46:56 +03:00
nordsoft
b8ab64f448 Make options tab configurable 2023-08-23 19:29:50 +04: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
a852236602
Merge pull request #2627 from IvanSavenko/threading_cleanup 
Threading cleanup
 2023-08-23 17:30:31 +03:00
Ivan Savenko
3eb19e6ed7 Fix possible unprotected access to battleint 2023-08-23 16:32:29 +03:00
Ivan Savenko
a44c08a847 Slightly better thread names 2023-08-23 16:32:29 +03:00
Ivan Savenko
0613756abc Remove unused code 2023-08-23 16:32:29 +03:00
Ivan Savenko
dfe8ca3d61 Use more lightweight scoped_lock 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
Ivan Savenko
87957e74c1 Replaced boost::thread_specific_ptr with thread_local 2023-08-23 16:32:29 +03:00
Ivan Savenko
142889e3a5 Give all threads created by client human-readable name for debug 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
nordsoft
cda4ae84aa Don't send loading updates too frequently 2023-08-23 15:45:00 +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
Nordsoft91
e09b13c00a
Merge pull request #2576 from Nordsoft91/turn-timer 
Implement turn timer feature
 2023-08-23 01:48:12 +04:00
nordsoft
937935ce8c Fix compiling (how does it work on mac?) 2023-08-23 01:20:29 +04:00
Michael
65884b15d0
Update settings.json 
best setting as default (subfolder with map-name)
 2023-08-22 20:51:28 +02:00
Michael
68a1b883eb
autosave folders 2023-08-22 20:43:44 +02:00
nordsoft
15847c89b6 Fix tests 2023-08-22 21:02:32 +04:00
nordsoft
dfaf778d16 Redesign loading solution 2023-08-22 20:10:20 +04:00
nordsoft
d9a2a7bfd0 Fix minor points 2023-08-22 16:00:14 +04:00
nordsoft
fb21620c60 Fix battle timer reset after refactoring 2023-08-22 14:14:50 +04:00
nordsoft
dd3e9f102b Fix game crash at AI turn 2023-08-22 02:08:42 +04:00
Nordsoft91
ec4da06b56
Merge pull request #2631 from Laserlicht/date_alignment 
date alignment
 2023-08-22 02:00:49 +04:00
nordsoft
7b4b01a280 Adopt turn timer to battle refactoring 2023-08-22 01:49:50 +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