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,764 Commits 30 Branches 75 Tags
a18aa2cf7ebef76911436b83000e589bf8b76541
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
nordsoft bb4905af48 Change resourceID with ResourcePath 2023-09-08 01:54:29 +02:00
nordsoft 8c94d082c8 Merge remote-tracking branch 'upstream/develop' into launcher-size-support 2023-09-08 01:51:52 +02:00
nordsoft 40ea45498f Rename 2023-09-07 19:57:57 +02:00
nordsoft 32eba61af4 Fix compliling 2023-09-04 13:14:11 +04:00
nordsoft 8b91a1315c Fix compiling 2023-09-04 03:37:55 +04:00
nordsoft db32c2387e Fix hero initialization form random map 2023-09-04 02:58:16 +04: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 96d244a315 Fix compiling 2023-09-03 18:28:22 +04:00
nordsoft 1f9bec32a1 Maybe ununsed 2023-09-03 17:55:16 +04:00
nordsoft b0105e8a3a Channels support 2023-09-03 16:47:34 +04:00
nordsoft ef853ab96d Move chat logic to separate class 2023-09-03 03:05:48 +04:00
nordsoft d0b3567447 Advanced chat 2023-09-03 01:46:25 +04:00
nordsoft 75258baefc Chat minor improvements 2023-09-02 22:53:44 +04:00
nordsoft 32ad463170 Rename 2023-09-02 14:15:37 +04:00
nordsoft 1ef407ea9f Fixes 2023-09-02 14:10:50 +04:00
nordsoft e85eb36bbd Battle timer fix 2023-09-02 13:14:24 +04:00
nordsoft 48fb167fef Fix timer end turn while standing on obstacles/water 2023-09-02 03:27:46 +04:00
nordsoft 0fc6e2b316 rollback query blocking 2023-09-02 03:17:51 +04:00
nordsoft 9cd3b537ad Add turn timer allowed option 2023-09-02 03:17:32 +04:00
nordsoft 4024a44b7e Unify internal units 2023-09-02 00:18:23 +04:00
nordsoft 3ee91ca9dc Support local and download mod size 2023-09-01 18:43:26 +04:00
nordsoft 5875dc6b8f Smarter double-click 2023-09-01 17:40:52 +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
nordsoft 31956549e6 Double click behavior 2023-09-01 03:29:50 +04:00
nordsoft d7f0698651 Change text hints 2023-08-31 20:46:48 +04:00
nordsoft 00216168bf Timer works as designed 2023-08-30 03:44:09 +04: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
nordsoft f30f00faa0 Timer pausing while waiting for player accept turn 2023-08-30 02:18:44 +04:00
nordsoft b4c20734f3 Support timer logic for pve and pvp 2023-08-30 02:17:29 +04:00
nordsoft 03496e6738 Code review fixes 2023-08-29 15:48:42 +04:00
nordsoft c8243313b8 Translations for turn timers 2023-08-29 14:53:15 +04:00
nordsoft 883c68b151 Remove unused variable 2023-08-28 19:57:42 +04:00
nordsoft 432ed18579 Fix overlap of timer and fps widgets 2023-08-28 19:46:09 +04:00
nordsoft b5417c667c Hold timer client counter 2023-08-28 19:46:09 +04:00
nordsoft 21af69e0b7 Fix timer synchornization 2023-08-28 19:45:15 +04:00
nordsoft 68b11dbe38 Fix no-base turn timer 2023-08-28 19:45:15 +04:00
nordsoft 15f57a0817 Timer enabler 2023-08-28 19:45:15 +04:00
nordsoft 2c61d1b23f Use precision clocks for timer 2023-08-28 19:45:15 +04:00
nordsoft 7dc1717ec6 Handle timer for tactic phase 2023-08-28 19:45:15 +04:00
nordsoft 4ee47b01ae Make possible to play with different timers independently 2023-08-28 19:45:15 +04:00
nordsoft 6226ddf4a7 Fix potential concurrenccy issues 2023-08-28 19:45:15 +04:00
nordsoft 71cbb0e2e7 Change query reply method 2023-08-28 18:56:36 +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 084122bc80 Fix compiling 2023-08-28 17:26:16 +04:00
nordsoft 78397d6d1a Fix compiling 2023-08-28 17:21:38 +04:00
nordsoft 439254f921 Fix mistake 2023-08-28 17:21:38 +04:00
nordsoft 49a76ac14c Code review tweaks 2023-08-28 17:21:38 +04:00
nordsoft 44791b6665 Revert "Auxiliary commit to revert individual files from c7390a921e3871102292f589978e9e9010eface9" 
This reverts commit e749954761facf4a760c6b4ef361f2ebce7b1f01.
 2023-08-28 17:21:38 +04:00
nordsoft 899cf5ee99 Update mods repo link for android 2023-08-28 17:21:38 +04:00
nordsoft 86ab97c64f Fix stop on flight for timer 2023-08-28 17:21:38 +04:00
nordsoft de8bd48398 Added right click pop-up for text inputs 2023-08-28 17:21:38 +04:00
nordsoft 614a285fb8 Fix hot seat timer visualization 2023-08-28 17:21:38 +04:00
nordsoft e4e9bcfb9b Show time for other player during battle 2023-08-28 17:19:04 +04:00
nordsoft 0bb352565a Fix creature timer update 2023-08-28 17:12:08 +04:00
nordsoft 0bc2302f1f Fix battle timer logic 2023-08-28 17:12:08 +04:00
nordsoft fdaf05514a Correct network data exchange and time parsing 2023-08-28 17:10:52 +04:00
nordsoft 3962b71262 Remove unused variable 2023-08-28 17:10:52 +04:00
nordsoft 6380a02e10 Upgrade launcher default repo 2023-08-28 17:10:52 +04:00
nordsoft 1e527a6942 Minor changes 2023-08-28 17:10:52 +04:00
nordsoft 86e0ea15fb Fix turn timer settings 2023-08-28 17:10:52 +04:00
nordsoft d758727c23 Basic timer ui is almost complete 2023-08-28 17:10:52 +04:00
nordsoft c7ded69edc Minor changes 2023-08-28 17:10:52 +04:00
nordsoft c064b805c2 Refactor combo box 2023-08-28 17:10:52 +04:00
nordsoft 39fbdd300d Refactor combo box 2023-08-28 17:10:52 +04:00
nordsoft 6e7b13fcbe Add compatibility with minor version 2023-08-28 16:21:46 +04:00
nordsoft 3e502955b3 Support FilledTexturePlayerColored in configurable interface 2023-08-27 22:34:02 +04:00
nordsoft 596b98e1c1 Fix AI freeze regression 2023-08-24 16:42:47 +04:00
nordsoft 6efccb2503 Fix removing loading screen 2023-08-24 15:01:43 +04:00
nordsoft b8ab64f448 Make options tab configurable 2023-08-23 19:29:50 +04:00
nordsoft cda4ae84aa Don't send loading updates too frequently 2023-08-23 15:45:00 +04:00
nordsoft 937935ce8c Fix compiling (how does it work on mac?) 2023-08-23 01:20:29 +04: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
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
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
nordsoft 989a0859ef Fix tutorial loading 2023-08-20 17:58:40 +04:00
nordsoft a09cb23a85 Better handling other players for turn timer 2023-08-20 04:06:52 +04:00
nordsoft 314a17cdd9 Paint timer color into player color 2023-08-19 19:45:25 +04:00
nordsoft d4ab3087cb Disable timer for AI players 2023-08-19 19:00:08 +04:00
nordsoft 2fff74deea Remove uninitialized variable 2023-08-19 18:59:31 +04:00
nordsoft 647c7c15a3 Add sound notification for timer 2023-08-17 01:10:03 +04:00
nordsoft d26fdaefe4 Battle timer 2023-08-14 23:31:44 +04:00
nordsoft 0c76ae89f8 Revert "Auxiliary commit to revert individual files from e426924930c761b5f10e4fd8e777b55f8db329e2" 
This reverts commit c1d6b2836fca30f99d49012c5ae989cdc5ad0e4f.
 2023-08-14 16:33:41 +04:00