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
16,707 Commits 30 Branches 75 Tags
39d3217d209a9cd048b7d5f3a3780606db05f5b9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Savenko 39d3217d20 Merge pull request #4428 from Laserlicht/vcmp_rework 
VCMP format -> change to zip
 2024-08-12 17:20:22 +03:00
Ivan Savenko 170330109f Merge pull request #4415 from godric3/map-editor-validate-spells 
map editor: check hero and town spells during mod assessment
 2024-08-12 17:20:01 +03:00
Ivan Savenko f7c82d7909 Merge pull request #4400 from kdmcser/support_0_spellpower_and_knowledge 
support configure for minimal primary skill values
 2024-08-12 17:16:46 +03:00
Ivan Savenko 79c55bc898 Merge pull request #4425 from IvanSavenko/ui_cleanup 
Remove old code from UI system
 2024-08-12 17:16:03 +03:00
Ivan Savenko 84f29183c8 Merge pull request #4391 from Laserlicht/bank_support 
[HotA] Bank support
 2024-08-12 00:24:32 +03:00
Ivan Savenko c6943e0ab0 Fix build, fix element disabling 2024-08-09 16:41:11 +00:00
Ivan Savenko 220c5cb1d7 Remove no longer used DISPOSE flag from CIntObject 2024-08-09 15:50:37 +00:00
Ivan Savenko 4ff2894cf2 Add comments 2024-08-09 15:37:31 +00:00
Ivan Savenko 9fba3d97f1 Renamed & unified OBJECT_CONSTRUCTION macro set 2024-08-09 15:30:04 +00:00
Ivan Savenko 337431901f Moved object construction macros to more logical location 2024-08-09 14:57:40 +00:00
Ivan Savenko 00605b5129 Remove largely unused defActions member from CIntObject 2024-08-09 14:26:53 +00:00
Ivan Savenko 85cf33e5a8 Merge pull request #4422 from MichalZr6/fix_unsigned_to_signed 
blockingDialog functions: the `answer` parameter can be negative
 2024-08-09 15:31:45 +03:00
Ivan Savenko 7d30b660ea Merge pull request #4359 from Laserlicht/statistic 
Writing some statistics and make it possible to export via csv
 2024-08-09 15:31:13 +03:00
Ivan Savenko ffb8efc415 Merge pull request #4225 from godric3/map-editor-town-configuration-improvements 
Map editor town configuration improvements (buildings, spells, events)
 2024-08-09 15:26:33 +03:00
Ivan Savenko 1b6fd45aa7 Merge pull request #4421 from SoundSSGood/endBattleConfirm-fix 
endBattleConfirm crash fix
 2024-08-09 15:22:58 +03:00
Ivan Savenko 9f489b306c Merge pull request #4414 from Laserlicht/focus 
scroll adventure map only if window in focus
 2024-08-09 15:21:36 +03:00
Ivan Savenko 3f9e57d3f3 Merge pull request #4334 from Laserlicht/quickspell_improve 
quickspell improvements
 2024-08-07 13:08:13 +03:00
Ivan Savenko 65af198fbf Merge pull request #4341 from vcmi/force_portal_connection 
Add RMG connection option "forcePortal"
 2024-08-07 13:07:45 +03:00
Ivan Savenko a4dd510735 Merge pull request #4358 from IvanSavenko/integer_divide 
Add helper functions for integer division rounding
 2024-08-06 18:10:03 +03:00
Ivan Savenko 3b6ff46d2b Merge pull request #4360 from IvanSavenko/terminate_handler 
Enabled terminate handler and call stack writing on all platforms
 2024-08-06 18:09:51 +03:00
Ivan Savenko 97357071b0 Merge pull request #4380 from SoundSSGood/moveChildForeground 
Fixed graphical artifacts
 2024-08-06 18:09:38 +03:00
Ivan Savenko 75cc5dbed9 Merge pull request #4387 from altiereslima/develop 
Update Portuguese Translation
 2024-08-06 18:09:19 +03:00
Ivan Savenko c1c04b3eb4 Merge pull request #4401 from vcmi/dydzio0614-patch-1 
Fix github download counters
 2024-08-05 20:12:17 +03:00
Ivan Savenko b7391f49f6 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-08-05 10:36:10 +00:00
Ivan Savenko 5313b5c82c Merge pull request #4392 from IvanSavenko/fix_regression 
Fix regressions in 1.5.6
 2024-08-04 22:07:25 +03:00
Ivan Savenko edad888915 Fixed non-scrollable invite to private room widget 2024-08-04 13:58:20 +00:00
Ivan Savenko dde5cea601 Fix activation of world view on end turn in multiplayer 2024-08-04 13:19:12 +00:00
Ivan Savenko e8c3252214 Do not auto-remove dialogs such as new week 2024-08-04 13:14:28 +00:00
Ivan Savenko d36f90e6b6 Fixed heading in 1.5.6 changelog 2024-08-04 13:12:41 +00:00
Ivan Savenko 500e9a8645 Added downloads counter for 1.5.6 2024-08-04 13:12:30 +00:00
Ivan Savenko 81e6207df0 Add helper functions for integer division rounding 
Added set of functions that perform integer division with different
rounding modes:
- divideAndCeil - rounds up to next integer
- divideAndRound - rounds to nearest integer
- divideAndFloor - rounds to previous integer (equivalent to default
division)

Intended for use in library, where usage of floating point might lead to
desync in multiplayer games.

Replaced some cases that I knew of, including recent handicap PR
 2024-08-03 13:52:14 +00:00
Ivan Savenko 6af0edcf90 Merge pull request #4366 from vcmi/beta 
Merge beta -> master
 2024-08-03 16:35:04 +03:00
Ivan Savenko c8b48318b7 Merge pull request #4365 from Laserlicht/docs_dev 
changelog - hint for newest version
 2024-08-03 16:16:05 +03:00
Ivan Savenko 1ccfa6072f Merge pull request #4357 from IvanSavenko/changelog_156 
Changelog for 1.5.6
 2024-08-03 12:49:06 +03:00
Ivan Savenko a4e4ec565b Changelog for 1.5.6 2024-08-02 20:16:04 +00:00
Ivan Savenko 7bcd6b1b0d Merge pull request #4363 from IvanSavenko/fixes_156 
Fixes for 1.5.6 release
 2024-08-02 21:23:27 +03:00
Ivan Savenko 13b2008f79 Enabled terminate handler and call stack writing on all platforms 
Attempt to get a bit more debug info from crashes. VCMI will now:
- use c++ terminate handler on any platform in release builds
- attempt to write call stack to log file using boost::callstack

Since I use std::set_terminate this will only affect c++ exceptions, e.g.
std::runtime_error and will not affect OS signals, e.g. SIGSEGV. Handling
signals is OS-specific and has a lot of limitations that I don't want to
investigate. Besides - most of our crashes are now caused by c++
exceptions.

Haven't tested on other platforms, but should at the very least write
exception information (`e.what()`) for all exceptions and function names
for methods exported from dll's (libvcmi.so & AI's). Possibly more, if
debug information is present.
 2024-08-02 17:59:56 +00:00
Ivan Savenko 5023e08ae8 Fix crash on testing for hero faction before deserializing hero type 2024-08-02 16:00:17 +00:00
Ivan Savenko 13108849ca Try to fix crash on transferring component of a composite artifact 2024-08-02 16:00:17 +00:00
Ivan Savenko c9b6b17422 Add more logging for weird crash on game start 2024-08-02 16:00:17 +00:00
Ivan Savenko 0ac1ef077d Workaround for hota witch hut preview 2024-08-02 16:00:07 +00:00
Ivan Savenko afbb42ff33 Merge pull request #4356 from IvanSavenko/version_bump_156 
Version bump to 1.5.6
 2024-08-02 18:18:58 +03:00
Ivan Savenko 4acfa38d63 Merge pull request #4355 from IvanSavenko/mp_fixes 
Fix infinitely updating simultaneous turns slider
 2024-08-02 18:05:04 +03:00
Ivan Savenko 8ce6bcdf3b Right-clicking dwellings will now show recruitable creatures (but not 
their number) for all players
 2024-08-02 15:03:25 +00:00
Ivan Savenko 46669e78e8 Fix possible crash on deletion of adventureInt after GH on shutdown 2024-08-02 15:02:37 +00:00
Ivan Savenko 16b28c28e4 Version bump to 1.5.6 2024-08-02 15:00:16 +00:00
Ivan Savenko 2c42737b28 Fix infinitely updating simultaneous turns slider 2024-08-02 12:20:14 +00:00
Ivan Savenko 257fb8c70c Merge pull request #4327 from Laserlicht/handicap 
Handicap / resource transfer
 2024-08-01 23:11:22 +03:00
Ivan Savenko b7b25bffd2 Merge pull request #4347 from kaja47/opto 
little optimization in MapRenderer
 2024-08-01 21:18:44 +03:00
Ivan Savenko 9f7abfe6e9 Merge pull request #4346 from Laserlicht/mod_comp 
[1.5.6?] online lobby - mod compatibility improvements
 2024-08-01 21:18:30 +03:00
Ivan Savenko 92902d3327 Merge pull request #4345 from Laserlicht/text_sizes 
[1.5.6?] limit text sizes in online lobby
 2024-08-01 21:18:16 +03:00
Ivan Savenko 8d9f690ae4 Merge pull request #4340 from IvanSavenko/mp_fixes 
[1.5.6?] Fixes for issues with multiplayer
 2024-08-01 21:17:27 +03:00
Ivan Savenko 88eff2609b Merge pull request #4332 from Laserlicht/campaign_highscores 
fix campaign highscores
 2024-08-01 21:16:50 +03:00
Ivan Savenko 7fe9c473b4 Merge pull request #4339 from IvanSavenko/artifact_crash_fix 
Fixed crash on deserialization of new artifacts (and possibly some other objects)
 2024-07-30 13:16:31 +03:00
Ivan Savenko 48c92711f2 Fixed deserialization of new artifacts (and possibly some other objects) 
Was broken in my previous PR, since pointer graph serialization was
enabled by default, leading to deserializationFix triggering on netpack
apply.

Cleaned up / clarified code
 2024-07-29 18:19:15 +00:00
Ivan Savenko 789e370950 Add compatibility for old vcmi maps 2024-07-29 17:13:31 +00:00
Ivan Savenko 15f37f8c4b Fix possible crash on invalid SPELL_LIKE_ATTACK ability 2024-07-29 17:13:31 +00:00
Ivan Savenko 5f0e6f7ce1 Close all dialogs on start of new turn in MP 2024-07-29 17:13:31 +00:00
Ivan Savenko 434a2fb0fb Explicitly specify to use ranged or melee attack for damage estimation 2024-07-29 17:13:31 +00:00
Ivan Savenko 87b5f955d1 Fix some shortcuts not active during enemy turn in multiplayer 2024-07-29 17:13:31 +00:00
Ivan Savenko 74fea5109b Show non-learnable spells from rewardable object as greyed-out 2024-07-29 17:13:31 +00:00
Ivan Savenko f9348fc84a Do not hide spells from reward if hero can't learn them 2024-07-29 17:13:31 +00:00
Ivan Savenko b6c22b2053 Fix typo 2024-07-29 17:13:31 +00:00
Ivan Savenko dac18ae35a Merge pull request #4315 from IvanSavenko/map_overlay 
Add overlay that shows map objects and their name & status
 2024-07-29 18:56:53 +03:00
Ivan Savenko 6ac3752325 Merge pull request #4330 from Laserlicht/spellbook 
check spellbook
 2024-07-27 19:34:50 +03:00
Ivan Savenko 9ee25ae850 Merge pull request #4311 from altiereslima/develop 
Update Portuguese Translation
 2024-07-26 14:22:24 +03:00
Ivan Savenko ec63f3eeac Merge pull request #4314 from IvanSavenko/tower_target_selection 
Implemented simple target selection logic for arrow towers
 2024-07-26 14:22:13 +03:00
Ivan Savenko aab84b2974 Merge pull request #4320 from Alexander-Wilms/relative-test-data-url 
CI: Use URL relative to repo's owner for test data
 2024-07-26 14:21:57 +03:00
Ivan Savenko b89b5d3d82 Merge pull request #4324 from utzuro/docs/add-nixos-build-instructions 
docs: add building instruction for the NixOS
 2024-07-26 14:21:41 +03:00
Ivan Savenko 37cf788079 Merge pull request #4317 from IvanSavenko/split_townhandler 
Split CTownHandler into smaller chunks
 2024-07-22 17:42:48 +03:00
Ivan Savenko e99fb539c6 Merge pull request #4256 from IvanSavenko/changelog_initial 
Initial version of 1.6 changelog
 2024-07-22 17:42:02 +03:00
Ivan Savenko e8aa6efbb9 Merge pull request #4261 from kaja47/shrinkage 
Reduce size of Bonus struct from 320 bytes to 296 bytes.
 2024-07-22 17:12:08 +03:00
Ivan Savenko 69c3a6afd5 Merge pull request #4319 from Laserlicht/patch-4 
fix exiting when bluetooth mouse is connected while running
 2024-07-22 12:58:25 +03:00
Ivan Savenko 71f0f86226 Initial version of 1.6 changelog, with all changes so far 2024-07-21 18:48:01 +00:00
Ivan Savenko 4aa73b40c9 Split CTownHandler into smaller chunks 2024-07-21 18:21:48 +00:00
Ivan Savenko 5bd9a32d97 Implemented simple target selection logic for arrow towers 2024-07-21 13:16:33 +00:00
Ivan Savenko 550540f8ab Merge pull request #4316 from IvanSavenko/crashfixes 
Crashfixes
 2024-07-21 16:15:28 +03:00
Ivan Savenko 4533271692 Merge pull request #4312 from IvanSavenko/texthandler_split 
Split CGeneralTextHandler file into 1 file per class form
 2024-07-21 13:49:14 +03:00
Ivan Savenko 398111f8d7 Merge pull request #4212 from alkazandzhiev/alkazandzhiev/saveMultiPlayerNames 
Save all human player names in the configuration
 2024-07-21 11:20:25 +03:00
Ivan Savenko 8a67a08bb9 Merge pull request #4308 from Alexander-Wilms/msvc-ci-remove-dumpbin-search 
MSVC CI script: Don't run vswhere to find dumpbin.exe, since it is no…
 2024-07-20 22:22:18 +03:00
Ivan Savenko 22e2450650 Merge pull request #4310 from SoundSSGood/endBattleConfirm-fix 
Fixed regression from https://github.com/vcmi/vcmi/pull/4186
 2024-07-20 22:20:46 +03:00
Ivan Savenko 44f516d2fc Add overlay that shows map objects and their name & status 2024-07-20 18:47:20 +00:00
Ivan Savenko 31738e8f90 Always track already serialized pointers to avoid infinite recursion on 
sending complex objects
 2024-07-20 18:29:41 +00:00
Ivan Savenko 5b9130c288 Fixes broken player-coloring on animations (e.g. hero in battle) 2024-07-20 18:28:47 +00:00
Ivan Savenko 1c522c49b6 Fix possible crash on trying to move to invalid battlefield hexes 2024-07-20 18:28:13 +00:00
Ivan Savenko 1aa391fdf8 Split CGeneralTextHandler file into 1 file per class form 
All text processing code is now located in lib/texts.
No changes other than code being moved around and adjustment of includes

Moved without changes:
Languages.h           -> texts/Languages.h
MetaString.*          -> texts/MetaString.*
TextOperations.*      -> texts/TextOperations.*

Split into parts:
CGeneralTextHandler.* -> texts/CGeneralTextHandler.*
                      -> texts/CLegacyConfigParser.*
                      -> texts/TextLocalizationContainer.*
                      -> texts/TextIdentifier.h
 2024-07-20 12:55:17 +00:00
Ivan Savenko 3c611ffa5b Merge pull request #4307 from IvanSavenko/misc_fixes 
Miscellaneous fixes
 2024-07-20 12:56:10 +03:00
Ivan Savenko 08a6b859d2 Merge pull request #4304 from Laserlicht/quickspell-option 
option to enable quickspell
 2024-07-20 12:53:36 +03:00
Ivan Savenko 58c7afefd8 Merge pull request #4298 from Alexander-Wilms/vcmilauncher-forward-stdout-stderr 
startExecutable(): Forward executable's output, so vcmiclient's stdou…
 2024-07-20 12:51:32 +03:00
Ivan Savenko d59a5dad7d Merge pull request #4299 from Laserlicht/input_modi_detection 
input mode detection
 2024-07-20 12:51:08 +03:00
Ivan Savenko 34204d5898 Merge pull request #4305 from Laserlicht/fix_search 
fix search in quick spell spellbook
 2024-07-20 12:50:43 +03:00
Ivan Savenko 2796931259 Fix credits scrolling 2024-07-20 08:28:35 +00:00
Ivan Savenko 8d4f8dcf9c Add unassigned by default hotkeys to show visitable or blocked tiles 2024-07-19 19:38:40 +00:00
Ivan Savenko e862b9c868 Fix crash on opening creature window with bonuses that don't have icon 2024-07-19 19:37:22 +00:00
Ivan Savenko 75fd67a921 Fix mouse scroll not working in right-click popups 2024-07-19 19:36:05 +00:00
Ivan Savenko 1dec5e56a9 Fix cursor shadow option in battles 2024-07-19 19:35:39 +00:00
Ivan Savenko 5ad1c35354 Merge pull request #4303 from IvanSavenko/savecompat_fix 
Fix crash on loading saves made in 1.4/1.5
 2024-07-19 17:17:54 +03:00
Ivan Savenko e0c6b6e3d0 Fix crash on loading saves made in 1.4/1.5 2024-07-19 13:57:06 +00:00
Ivan Savenko dc27e8eccb Merge pull request #4097 from IvanSavenko/render_refactor_2 
[1.6] Render refactor
 2024-07-19 16:07:54 +03:00
Ivan Savenko e2af6c0f92 Merge pull request #4295 from Alexander-Wilms/translation-error-messages 
Less noise when switching languages in launcher
 2024-07-19 15:44:54 +03:00