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
12,650 Commits 30 Branches 75 Tags
c8a6cd74cca6cce7332dbdc44ae322da13636bb6
Commit Graph
12650 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Konstantin c9bc3fd4e1 CSpellHandler: use getBonusBearer 
Use getBonusBearer method and cachingStr method for optimization
 2023-08-23 17:52:16 +03:00
Ivan SavenkoandGitHub 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
Nordsoft91andGitHub 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
MichaelandGitHub d2bbe0f35a starttime in foldername 2023-08-23 01:47:55 +02:00
MichaelandGitHub 538acfe3c0 Update StartInfo.h 
fix
 2023-08-23 01:08:57 +02:00
MichaelandGitHub a0450d1363 format... 2023-08-23 00:39:09 +02:00
MichaelandGitHub fed9ae5157 Merge branch 'develop' into autosave 2023-08-23 00:37:15 +02:00
MichaelandGitHub 51ba22a631 code review 2023-08-23 00:35:44 +02:00
Nordsoft91andGitHub 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
MichaelandGitHub 65884b15d0 Update settings.json 
best setting as default (subfolder with map-name)
 2023-08-22 20:51:28 +02:00
MichaelandGitHub 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
Nordsoft91andGitHub 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
nordsoft 4cf28fe00e Fix linux clang compiling 2023-08-22 00:40:03 +04:00
nordsoft b1bfc2239f Backward compatibility with mods 2023-08-22 00:32:26 +04:00
Ivan SavenkoandGitHub 78780bb20c Merge pull request #2579 from IvanSavenko/server_battle_processor 
(develop) Refactoring of server-side battles code
 2023-08-21 23:21:40 +03:00
MichaelandGitHub 0dab3b83a0 date alignment 2023-08-21 20:45:00 +02: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 a60d503078 Fix progress bar 2023-08-21 19:21:32 +04: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
Dydzio 28fe28adf5 Fix player coloring 2023-08-21 17:08:15 +02:00
Dydzio b73f9325ad Fixes from code review 2023-08-21 16:56:50 +02:00
Ivan Savenko 5f7f0ec2ea Declare enum classes as int8_t 2023-08-21 17:55:49 +03:00
Ivan Savenko 1c552ba9d9 Remove unused code 2023-08-21 17:55:49 +03:00
Ivan Savenko 8154e84825 Fix tactics usage 2023-08-21 17:55:49 +03:00
Ivan Savenko 276c00b284 Removed excessive includes 2023-08-21 17:55:49 +03:00
Ivan Savenko 2be9664d26 Remove no longer used code 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 a1092e0f3f Fix battle ending 2023-08-21 17:55:49 +03:00
Ivan Savenko a1d3181a98 Unified spellcasting handling with other actions 2023-08-21 17:55:49 +03:00