games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Code Issues Releases Activity
12,494 Commits 19 Branches 63 Tags 113 MiB
2fef0e8d40
Commit Graph

4662 Commits

Author SHA1 Message Date
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
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
f9410145d6 Fix handling of "7 days without town" loss condition 2023-08-24 23:34:33 +03:00
Ivan Savenko
b057230d85 Fix quest log button block status 2023-08-24 23:34:33 +03:00
Ivan Savenko
c171a3d6be Fix resource bar UI in hotseat 2023-08-24 23:34:33 +03:00
Ivan Savenko
97ef69c9ab Remove incorrect message on another player defeat 2023-08-24 23:34:33 +03:00
Ivan Savenko
e40dc76304 Fix giving commands in battles in hotseat 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
Nordsoft91
07210973f4
Merge pull request #2653 from Nordsoft91/turn-timer 2023-08-25 00:09:00 +04:00
Michael
37e2292720
count unicode chars to extra function 2023-08-24 18:34:00 +02:00
Andrii Danylchenko
f459c13bc3
Merge pull request #2661 from Nordsoft91/loading-bar 
Fix removing loading screen
 2023-08-24 16:34:11 +03:00
nordsoft
6efccb2503 Fix removing loading screen 2023-08-24 15:01:43 +04: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
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
Michael
4784ae94b5
revert uuid 2023-08-23 20:03:40 +02: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
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
344593e891 vcmi: made some CSpell properties private 
There are getters for it.
 2023-08-23 17:53:08 +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
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
Michael
d2bbe0f35a
starttime in foldername 2023-08-23 01:47:55 +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
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
d9a2a7bfd0 Fix minor points 2023-08-22 16:00:14 +04:00
Nordsoft91
ec4da06b56
Merge pull request #2631 from Laserlicht/date_alignment 
date alignment
 2023-08-22 02:00:49 +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
nordsoft
b1bfc2239f Backward compatibility with mods 2023-08-22 00:32:26 +04:00