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
9,787 Commits 30 Branches 75 Tags
108a42e4ba019a06284d6b9ef659a89a54e452c5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Savenko 108a42e4ba Reorganized includes for new layout. New class - IImageLoader 2023-02-01 20:42:06 +02:00
Ivan Savenko 84dfcacafd Updated CMakeLists and file headers 2023-02-01 16:42:03 +02:00
Ivan Savenko 4d8d886317 Move all created files into better locations 2023-02-01 16:28:48 +02:00
Ivan Savenko ae968d1865 Remove duplicated code from new files 2023-02-01 16:12:01 +02:00
Ivan Savenko 5cc0de2fc6 Finish CAnimation split 2023-02-01 16:04:14 +02:00
Ivan Savenko f6fa7f1ae0 temp rename 2023-02-01 16:03:48 +02:00
Ivan Savenko 54a95efc4d split CFadeAnimation into separate file 2023-02-01 16:03:17 +02:00
Ivan Savenko 3a88e7ce07 split CDefFile into separate file 2023-02-01 16:02:33 +02:00
Ivan Savenko eef5876069 split SDLImageLoader into separate file 2023-02-01 16:01:47 +02:00
Ivan Savenko d593b88713 split SDLImage into separate file 2023-02-01 16:00:32 +02:00
Ivan Savenko f5cd6a9abe split IImage into separate file 2023-02-01 15:59:52 +02:00
Ivan Savenko dfbcfb7b3c Remove duplicated code from new files 2023-02-01 15:56:44 +02:00
Ivan Savenko 3f1b1095e2 Finish split of cursors files 2023-02-01 15:50:36 +02:00
Ivan Savenko 769d4b3bfb temporary rename 2023-02-01 15:50:12 +02:00
Ivan Savenko bdc2d0c920 Split CursorSoftware into a new file 2023-02-01 15:48:59 +02:00
Ivan Savenko 418fd1491b Split CursorHardware into a new file 2023-02-01 15:48:06 +02:00
Ivan Savenko 67e7731752 Split ICursor into a new file 2023-02-01 15:45:22 +02:00
Ivan Savenko bfec00b022 Remove duplicated code in new files 2023-02-01 15:42:21 +02:00
Ivan Savenko 0ac411b5a0 Finalize split of Fonts.h/cpp 2023-02-01 15:38:24 +02:00
Ivan Savenko 3da4c9bb25 Moved CBitmapHanFont to a separate file 2023-02-01 15:36:38 +02:00
Ivan Savenko aab7e0a5ed Moved CTrueTypeFont to a separate file 2023-02-01 15:35:52 +02:00
Ivan Savenko 1884c409f9 Moved CBitmapFont to a separate file 2023-02-01 15:34:50 +02:00
Ivan Savenko 730b8e3fc2 Moved IFont to a separate file 2023-02-01 15:33:51 +02:00
Ivan Savenko bfea28b2b5 Remove duplicated code from changed files 2023-02-01 15:24:43 +02:00
Ivan Savenko 18adcdda14 Finish CAdvmapInterface split 2023-02-01 15:17:57 +02:00
Ivan Savenko 6fd1b9927c Restore CAdvMapInterface 2023-02-01 15:17:20 +02:00
Ivan Savenko 37d6d21e73 Moved CResDataBar into a separate file 2023-02-01 15:17:14 +02:00
Ivan Savenko aaf981a6dc Restore CAdvMapInterface 2023-02-01 15:16:07 +02:00
Ivan Savenko 540921b96d Moved CAdventureOptions into a separate file 2023-02-01 15:15:52 +02:00
Ivan Savenko 1078c4acb6 Restore CAdvMapInterface 2023-02-01 15:14:52 +02:00
Ivan Savenko 5e0c90dc8a Moved CTerrainRect into a separate file 2023-02-01 15:13:07 +02:00
Ivan Savenko 9366506e2c Finalized split of AdventureMapClasses 2023-02-01 14:01:48 +02:00
Ivan Savenko 900cc55ed5 Merge branches 'split_cadvmappanel', 'split_cingameconsole', 'split_clist', 'split_cminimap' and 'split_cinfobar' into client_files_layout_rearrangement 2023-02-01 13:56:22 +02:00
Ivan Savenko ef236be2da Created separate file for CInfoBar 2023-02-01 13:55:56 +02:00
Ivan Savenko d0c6627cdb Created separate file for CList 2023-02-01 13:50:13 +02:00
Ivan Savenko 27f2e4fd33 Created separate file for CMinimap 2023-02-01 13:49:31 +02:00
Ivan Savenko 87498287f5 Created separate file for CAdvMapPanel 2023-02-01 13:48:26 +02:00
Ivan Savenko 134b40363f Created separate file for CInGameConsole 2023-02-01 13:47:05 +02:00
Ivan Savenko 8a9492d129 Moved client files to more suitable locations 2023-02-01 13:09:19 +02:00
Ivan Savenko 49c94c1498 Merge pull request #1522 from rilian-la-te/russia 
Russian translation and Qt6 translation update
 2023-02-01 12:26:35 +02:00
Ivan Savenko 0ba74fea73 Merge pull request #1515 from IvanSavenko/time_based_animations 
Time based animations
 2023-02-01 12:25:54 +02:00
Ivan Savenko 885fad87f9 Merge pull request #1527 from IvanSavenko/sdl_abstraction_iteration 
SDL abstraction layer iteration
 2023-02-01 12:25:41 +02:00
Ivan Savenko 466a5ee400 Merge pull request #1531 from IvanSavenko/remove_mxe 
Remove mxe
 2023-01-31 21:24:39 +02:00
Ivan Savenko 2f31033dba Fix typo 2023-01-31 19:48:24 +02:00
Ivan Savenko c72fb1bcfe Added conan+mingw info to readme 2023-01-31 19:38:01 +02:00
Ivan Savenko 13dde2c4f3 Removed old info from readme 2023-01-31 18:50:22 +02:00
Ivan Savenko 8e13ed74d7 CMake version bump to 3.16, removed MXE workarounds 2023-01-31 18:48:14 +02:00
Ivan Savenko e938a9bb6c Removed non-preset build from CI config 2023-01-31 18:14:17 +02:00
Ivan Savenko a9669578fc Remove MXE action from CI 2023-01-31 18:13:51 +02:00
Ivan Savenko c3a2dee45a Code cleanup 2023-01-31 15:00:46 +02:00
Ivan Savenko c5508d33fc Merge pull request #1514 from IvanSavenko/rewardable_fixes 
Minor fixes to rewardable objects
 2023-01-31 12:47:24 +02:00
Ivan Savenko 971816004f Merge pull request #1509 from IvanSavenko/launcher_settings_refresh 
Launcher layout changes
 2023-01-31 12:46:48 +02:00
Ivan Savenko fc60a7aff0 Removed redundant include 2023-01-31 01:28:11 +02:00
Ivan Savenko bf343126c4 Fix Hero animation speed in battles 2023-01-31 00:42:50 +02:00
Ivan Savenko 5cc23cc286 Renamed SDL_Pixels -> SDL_PixelAccess due to similar SDL header 2023-01-30 20:06:08 +02:00
Ivan Savenko 9c3030603d Removed most SDL includes from headers, removed SDL int's 2023-01-30 19:55:32 +02:00
Ivan Savenko 57df0a6995 Fix crash on hovering prison 2023-01-30 19:00:51 +02:00
Ivan Savenko e14290fde0 Removed loading of images from file into SDL_Surface 2023-01-30 18:25:47 +02:00
Ivan Savenko 87218c63c4 CPicture now uses IImage internally 2023-01-30 17:18:59 +02:00
Ivan Savenko e35a669eeb Refactoring of CPicture class to improve encapsulation 2023-01-30 13:58:13 +02:00
Ivan Savenko 42df5626d9 Added Color class to replace SDL_Color 2023-01-30 00:12:43 +02:00
Ivan Savenko 8439477751 Added icons to mod action buttons 2023-01-29 22:04:01 +02:00
Ivan Savenko 3da50e83be Re-imported icons with higher size to avoid upscaling artifacts 2023-01-29 22:04:01 +02:00
Ivan Savenko 4fc96a09cb Simplified internal layout of Mod List, no visible changes 2023-01-29 22:04:01 +02:00
Ivan Savenko e87a157b32 Adjustments to Mods screen layout in Launcher 2023-01-29 22:04:01 +02:00
Ivan Savenko 8cdc9985d2 Small redesign of Settings tab in Launcher 2023-01-29 22:04:01 +02:00
Ivan Savenko 57ee9a9bf3 Merge vcmi/beta into vcmi/develop 2023-01-29 18:21:55 +02:00
Ivan Savenko 3749074a4d Renamed speed setting name to force-reset it to new scale 2023-01-28 16:49:35 +02:00
Ivan Savenko 9d1a075806 Fix battle speed selector in settings 2023-01-28 14:00:49 +02:00
Ivan Savenko a853045509 Removed unused value from creature config 2023-01-28 13:56:51 +02:00
Ivan Savenko d34efaeb81 All battle effects now use time-based timings 2023-01-28 13:19:35 +02:00
Ivan Savenko bdde9f831a Fixed timings of building construction to match H3 2023-01-28 13:19:35 +02:00
Ivan Savenko 09413c61b8 Changed timing of building fade-in to match H3 2023-01-28 13:19:35 +02:00
Ivan Savenko f1647cc3bb Animated spellcasting cursor now has same speed as in H3 2023-01-28 13:19:35 +02:00
Ivan Savenko 3acee297be CShowableAnim is now time-based with timing matching H3 2023-01-28 13:19:35 +02:00
Ivan Savenko a9fefffc65 Video playback is now time-based, using video file timings 2023-01-28 13:19:35 +02:00
Ivan Savenko a2cd17197e Fix Campfire Gold reward amount. Now always one of 400/500/600 2023-01-28 13:12:03 +02:00
Ivan Savenko d82822d37a Fix reset of rewardable objects with reset period of 1 day 2023-01-28 13:12:03 +02:00
Ivan Savenko 7bbaae75a2 Merge pull request #1508 from kambala-decapitator/shipyard-regression 
attempt to show shipyard dialog only when a hero is selected
 2023-01-28 02:04:10 +02:00
Ivan Savenko c2c08a46bf Merge pull request #1513 from IvanSavenko/gui_handler_remove_current_event 
Removed pointer to current SDL_Event from GuiHandler
 2023-01-28 01:35:08 +02:00
Ivan Savenko 50a0fc4fb2 Removed pointer to current SDL_Event from GuiHandler 2023-01-27 23:17:40 +02:00
Ivan Savenko 4d1c338503 Merge pull request #1498 from rilian-la-te/conan-v2 
Conan as MXE replacement
 2023-01-27 23:14:37 +02:00
Ivan Savenko beb58ee8b0 Merge pull request #1516 from IvanSavenko/changelog_fix 
Fix formatting of list inside another list
 2023-01-27 13:51:37 +02:00
Ivan Savenko 94e7293eec Fix formatting of list inside another list 2023-01-27 13:24:13 +02:00
Ivan Savenko aef4cb3c71 Merge pull request #1466 from IvanSavenko/translate_adventure_map 
Translate adventure map objects
 2023-01-27 11:38:16 +02:00
Ivan Savenko 2b28dc5b2d Merge pull request #1512 from IvanSavenko/changelog_markdown 
Converted ChangeLog to use Markdown syntax
 2023-01-27 11:38:00 +02:00
Ivan Savenko e87adf334d Fix loading of vcmi json maps 2023-01-26 23:32:56 +02:00
Ivan Savenko 8b2d336562 Fix initialization of visitDir in templates 2023-01-26 23:32:56 +02:00
Ivan Savenko a3846f1b31 Fix incorrect identifiers format 2023-01-26 23:32:56 +02:00
Ivan Savenko eebc6fd625 Map object use format mod:object (or mod:object.subobject) 2023-01-26 23:32:56 +02:00
Ivan Savenko 7b82387a49 Dwellings & Banks will register custom names for their objects 2023-01-26 23:32:56 +02:00
Ivan Savenko bc27faea57 All objects will register single name per object type 2023-01-26 23:32:55 +02:00
Ivan Savenko 49d0459412 Remove unused code 2023-01-26 23:27:26 +02:00
Ivan Savenko 50e8a62178 Remove access to creature dwellings names via CGeneralTextHandler 2023-01-26 23:27:26 +02:00
Ivan Savenko f71cbc5d9b Fixed loading of object names 2023-01-26 23:27:26 +02:00
Ivan Savenko b13637cdd5 Fix regressions in RMG & map editor 2023-01-26 23:27:26 +02:00
Ivan Savenko d0fe875cc6 Removed wog object 2023-01-26 23:27:26 +02:00
Ivan Savenko 6f324216db Bugfixing 2023-01-26 23:27:24 +02:00
Ivan Savenko 6c472339ce Refactoring of ObjectClassesHandler 2023-01-26 23:26:49 +02:00
Ivan Savenko c5f72ccdc7 Names for object supertypes are passed through translator 2023-01-26 23:19:53 +02:00