games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity
10,069 Commits 22 Branches 61 Tags 102 MiB
4501036a04
Commit Graph

3690 Commits

Author SHA1 Message Date
Dydzio
d04c53e7e0 Merge branch 'develop' into settings-rework 2023-02-02 11:55:13 +01:00
Ivan Savenko
34772ef830 Fixed includes 2023-02-01 21:45:06 +02:00
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
0ba74fea73
Merge pull request #1515 from IvanSavenko/time_based_animations 
Time based animations
 2023-02-01 12:25:54 +02:00
Ivan Savenko
c3a2dee45a Code cleanup 2023-01-31 15:00:46 +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
Dydzio
88744633de Move buttons from mainOptions to SystemOptionsWindow 2023-01-30 23:26:33 +01:00
Dydzio
cc9d65a341 Make battle settings callable without battle, save last settings tab 2023-01-30 22:15:37 +01:00
Dydzio
9dd692cea4 Initial draft of tabbed settings window 2023-01-30 20:18:59 +01: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
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
Andrey Filipenkov
07dc2e1c48
Merge pull request #1496 from kambala-decapitator/resurrect-message 
show resurrect message in the battle log
 2023-01-29 22:18:32 +03:00
Konstantin
080d4b13dd vcmi: suppress warning on IOS 
Let CI passes on develop.
 2023-01-29 21:30:37 +03:00
Dydzio
1898b8218c Merge remote-tracking branch 'origin/develop' into settings-rework 2023-01-29 17:36:56 +01:00
Dydzio
e3578d0bc8 Extract options stuff to separate file 2023-01-29 17:36:33 +01:00
Ivan Savenko
57ee9a9bf3 Merge vcmi/beta into vcmi/develop 2023-01-29 18:21:55 +02:00
Dydzio
0fdfd8bdcb Configurable interface for game settings, change sound/music sliders 2023-01-29 16:49:47 +01: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
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
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
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
6c472339ce Refactoring of ObjectClassesHandler 2023-01-26 23:26:49 +02:00
Konstantin
cf56f7ccce vcmi: remove unused-but-set-variables 2023-01-26 23:49:00 +03:00
Andrey Filipenkov
612b5e2746 attempt to show shipyard dialog only when a hero is selected 
fixes regression from a4e8255cbc
 2023-01-25 20:49:37 +03:00
Andrey Filipenkov
7e78e0abdc
Merge pull request #1493 from kambala-decapitator/ios-spacebar 
[iOS] use pinch gesture as Spacebar hotkey instead of Tab
 2023-01-25 18:32:40 +03:00
Andrey Filipenkov
a2ac189e03 fix typo 2023-01-25 18:13:11 +03:00
Andrey Filipenkov
54537fc02c
Merge pull request #1478 from kambala-decapitator/units-huge-numbers 
limit displayed units number to 4 digits
 2023-01-25 17:47:08 +03:00
Andrey Filipenkov
b2d2c7a2dc
Merge pull request #1501 from kambala-decapitator/townportal-doubleclick 
handle double-click in Town Portal dialog
 2023-01-25 17:42:15 +03:00
Andrey Filipenkov
18c52f05ca
Merge pull request #1506 from kambala-decapitator/cmake-zip-ipa 
generate ipa file with CPack directly
 2023-01-25 17:41:10 +03:00
Konstantin
a7bd7232ce CGuiHandler: fix false positive dangling pointer 
Making this an auto variable fixes compilation with Werror.
 2023-01-25 17:14:41 +03:00
Dydzio
68be7643f1 Remove redundant method - code review suggestion 2023-01-25 13:06:13 +01:00
Ivan Savenko
52ab0f9b5b
Merge pull request #1446 from dydzio0614/movement-points-show 
Implement movement points info on ALT hold + tile mouse hover
 2023-01-25 12:30:34 +02:00
Andrii Danylchenko
1a7ec728d9
Merge pull request #1484 from kambala-decapitator/shipyard-fixes 
Shipyard dialog fixes
 2023-01-25 10:42:04 +02:00
Andrii Danylchenko
3cef3c10be
Merge pull request #1489 from dydzio0614/console-crash-fix 
Improve handling of empty text in console, remove unused includes
 2023-01-25 10:40:47 +02:00
Andrii Danylchenko
4cfc93d2da Somehow it works but JNI signatures were incorrect 2023-01-25 08:59:59 +02:00
Andrey Filipenkov
035851bb38 add max version condition to Xcode workaround 2023-01-24 20:18:09 +03:00
Andrey Filipenkov
08b04a3527 handle double-click in Town Portal dialog 2023-01-23 15:43:55 +03:00
Dydzio
4a23f93754 Give thicker frame to highlighted queue boxes 2023-01-23 12:32:20 +01:00
Dydzio
aa18118df0 Add simple cyan color frame on highlight + mouse right-click for mobile 2023-01-23 11:34:21 +01:00
Dydzio
bd1bd5064a Highlight logic for queue icon on stack hover, lacks visual representation 2023-01-22 20:06:10 +01:00
Dydzio
92754e22f0 Highlight stack on queue icon hovered 2023-01-22 20:03:11 +01:00
Adriankhl
1334b4b04f Fix ffmpeg include paths 2023-01-22 19:09:37 +01:00
Andrey Filipenkov
11ec500dff [iOS] use pinch gesture as Spacebar hotkey instead of Tab 2023-01-22 15:37:48 +03:00
Dydzio
30ef4ac1b1 Improve handling of empty text in console, remove unused includes 2023-01-22 01:14:28 +01:00
Dydzio
192a97bc05 Extract method and make customizable movement points string 2023-01-21 15:30:32 +01:00
Andrey Filipenkov
7b2540517b fix Main Thread Checker warnings on Apple platforms 2023-01-21 16:07:35 +03:00
Andrey Filipenkov
919c592e67 fix closing Buy Boat dialog with Escape button 2023-01-21 16:00:29 +03:00
Andrey Filipenkov
a4e8255cbc allow opening Buy Boat dialog on clicking shipyard on advmap when a town is selected 2023-01-21 15:58:12 +03:00
Dydzio
685d63603d Merge branch 'develop' into creature-numeric-quantities 2023-01-21 12:57:29 +01:00
Andrey Filipenkov
6727a3673f limit displayed units number to 4 digits on adventure map 
- garrison view (hero, town)
- small hero window
 2023-01-20 20:40:28 +03:00
Andrey Filipenkov
6f0cd37e8f limit displayed units number to 4 digits in battle 
- unit box
- turn queue
 2023-01-20 20:38:54 +03:00
Ivan Savenko
a19c9eccc4 Fix ios compile 2023-01-20 16:11:43 +02:00
Ivan Savenko
8ed115a628 Fix ios compile 2023-01-20 16:11:43 +02:00
Ivan Savenko
fc0f5a9fb3 Reduced SDL includes 2023-01-20 16:11:43 +02:00
Ivan Savenko
aae83af9f3 Fix Windows compile 2023-01-20 16:11:43 +02:00
Ivan Savenko
9be38780cd Removed remaining parts of Geomeotries.h/cpp 2023-01-20 16:11:43 +02:00
Ivan Savenko
6e2d09d605 Cleanup 2023-01-20 16:11:43 +02:00
Ivan Savenko
46931a0ecf Bugfixing 2023-01-20 16:11:43 +02:00
Ivan Savenko
ee7a573cb8 Refactoring of SDL API usage: 
- Rect no longer inherits from SDL_Rect
- renamed vcmi functions that used SDL naming format
- moved all functions in SDL_Extensions file into CSDL_Ext namespace
- SDL_Rect is now used only by SDL_Extensions, all other code uses Rect
 2023-01-20 16:11:43 +02:00
Ivan Savenko
9a30484183 Point and Rect now reside in library 2023-01-20 16:11:43 +02:00
Ivan Savenko
47c1803c42 Finalization of refactoring: 
- Entity interface now has getNameTranslated & getNameTextID methods
- Entity interface no longer has getName method
- removed (most) usages of normalizeIndentifier workaround method
- all moddable objects have identifier in form of mod:name
- all moddable object register strings in form of mod.type.name
 2023-01-20 15:18:36 +02:00
Ivan Savenko
05a1d7c6e3 All text for factions/towns/building are passed through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
388ed88b5d All artifact strings now pass through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
d2b837b116 All creature-related texts go through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
fa6f7513e8 All heroes-related strings are passed through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
e22f6283c2 Secondary skills strings are now passed through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
5da407e822 All spell texts are now passed through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
fb3c3a4636 Provide distance information fo Jousting ability 2023-01-20 15:18:10 +02:00
Ivan Savenko
785a9aadcd
Do not consider corpses for movement range display (#1476) 2023-01-20 15:16:28 +02:00
Ivan Savenko
21c053ba87 Fix assertion failure on shutdown 2023-01-20 15:15:57 +02:00
Ivan Savenko
b8c5a32b9b Fix attack targeting selection for double-wide units 2023-01-20 15:15:44 +02:00
Ivan Savenko
8aebe404e3 Fix status bar activation via click 2023-01-20 15:15:28 +02:00
Ivan Savenko
fd05036f3b Hardware cursor can now be hidden 2023-01-20 15:15:19 +02:00
Ivan Savenko
5484efde90 Mobile platforms will use software cursor as default 2023-01-20 15:15:19 +02:00
Andrey Filipenkov
1b3c07eda4 buy units starting from the highest level in the "buy all units" dialog 2023-01-20 15:14:15 +02:00
Andrii Danylchenko
9a765e5f67 Remove not supported method, allow relative mode for iOS 2023-01-19 08:26:35 +02:00
Andrii Danylchenko
6c843bce0b SDL relative pointer for android 2023-01-18 10:38:55 +02:00
Andrii Danylchenko
226668c428
Merge pull request #1453 from vcmi/android-fix-input-position-for-keyboard 
Fix android UI shift when keyboard appears
 2023-01-18 09:23:46 +02:00
Ivan Savenko
17fc9d8d8f Merge with vcmi/develop 2023-01-18 01:04:34 +02:00
Ivan Savenko
c400416058
Merge pull request #1409 from IvanSavenko/translate_terrain 
Refactoring of terrain handlers
 2023-01-18 00:12:31 +02:00
Nordsoft91
672bcb488b
Merge pull request #1381 from dydzio0614/client-commands-improvements 
Client commands code improvements + ingame support
 2023-01-18 02:04:38 +04:00
Ivan Savenko
05ac217b0f Merge with vcmi/develop 2023-01-17 23:02:25 +02:00
Andrii Danylchenko
174624d791
Merge pull request #1434 from vcmi/sdl-2-finger-touch 
Handle 2 fingers gesture as rclick via SDL
 2023-01-17 19:01:20 +02:00
Andrii Danylchenko
8f35bf8866 Fix android UI shift when keyboard appears 2023-01-17 16:44:46 +02:00
Andrii Danylchenko
c24b89fe06 2 finger rclick block adwmap scrolling and disable for iOS 2023-01-17 16:22:44 +02:00
Andrii Danylchenko
33f92bc4b1
Merge pull request #1438 from dydzio0614/build-speed-adjust 
Adjust newly built building appearance and outline blinking speed
 2023-01-16 20:27:56 +02:00
Dydzio
c3b254a815 Enum value can be used here as well 2023-01-16 18:26:31 +01:00
nordsoft
a2581fb942 Fix crash at start 2023-01-16 20:58:19 +04:00
nordsoft
d0b5a023ee Fix bug 2023-01-16 20:58:19 +04:00
nordsoft
8e1d8f835a Implemented support of protocol 4 2023-01-16 20:58:19 +04:00
Dydzio
c886a2a02b Implement movement points info on ALT hold + tile mouse hover 2023-01-16 17:29:33 +01:00
Andrii Danylchenko
b3f6250f4e
Merge pull request #1439 from dydzio0614/castle-shipyard-animation-fix 
Fix wrong rendering of castle shipyard
 2023-01-16 14:23:37 +02:00
Andrii Danylchenko
2b1511df99 SDL fix 2 finger touch when you remove fingers instantly 2023-01-16 13:39:45 +02:00
Andrii Danylchenko
7ccfcf51e9 Handle 2 fingers gesture as rclick via SDL 2023-01-16 09:46:52 +02:00
Dydzio
e593b61201 Merge branch 'develop' into client-commands-improvements 2023-01-16 01:13:06 +01:00
Dydzio
da39eb789f Fix indent 2023-01-16 00:37:18 +01:00
Dydzio
54e499f5e7 Minor refactoring from code review 2023-01-16 00:33:53 +01:00
Ivan Savenko
0a858d9a7c
Upgrade msvc to include enet and qt translator (#1436) 
- Updated MSVC prebuilt package
- Fixed build warnings
 2023-01-15 23:55:24 +02:00
Ivan Savenko
fc4121f5ec Rechecked & updated offsets of adventure map cursors 2023-01-15 21:18:34 +02:00
Ivan Savenko
385dda1c5b Clean surface before using it 2023-01-15 21:18:34 +02:00