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
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
75fd67a921
Fix mouse scroll not working in right-click popups
2024-07-19 19:36:05 +00:00
Laserlicht
598f1b0738
fix search in quick spell spellbook
2024-07-19 19:49:21 +02:00
Laserlicht
ee0cf58395
option to enable quickspell
2024-07-19 19:43:22 +02:00
Ivan Savenko
c40eea6e10
Fix fade-in animation - per-surface alpha was not set correctly
2024-07-19 10:46:20 +00:00
Ivan Savenko
0d6ec0d224
Reviewed usage of EBlitMode, now specified clearly in all cases
2024-07-19 10:08:50 +00:00
Ivan Savenko
f11c5f62e1
Remove no longer needed code
2024-07-19 10:08:50 +00:00
Ivan Savenko
230add02e4
Remove no longer used code
2024-07-19 10:08:50 +00:00
Ivan Savenko
920a39844b
Unified naming of method to recolor UI element to current player scheme
2024-07-19 10:08:50 +00:00
Ivan Savenko
fcafe53da9
Restored previously disabled University code, add interface to notify
...
market-like objects
2024-07-19 10:08:50 +00:00
Ivan Savenko
a8a330f39f
Remove unused code and no longer needed caching
2024-07-19 10:08:50 +00:00
Ivan Savenko
47de9a62dc
Created separate classes for shared, unchangeable image and image
...
manipulators owned by UI elements
2024-07-19 10:08:50 +00:00
Ivan Savenko
a1fb3b8b01
Reduce direct access to CAnimation, removed various caching schemes
2024-07-19 10:08:50 +00:00
Ivan Savenko
56f1725234
All images are now loaded via RenderHandler class
2024-07-19 10:08:50 +00:00
Ivan Savenko
2020d96070
Merge pull request #4071 from IvanSavenko/fix_rng_syncronization
...
[1.6] Fix potential desync if client uses different stdlib with different random number generators
2024-07-19 13:08:09 +03:00
Laserlicht
ac30f7757b
changed naming
2024-07-19 11:41:00 +02:00
Laserlicht
68213eb5a0
touch tutorial only if touch used
2024-07-19 04:16:43 +02:00
Laserlicht
9ac7db24ca
Merge branch 'develop' into quickspell
2024-07-18 21:24:42 +02:00
Ivan Savenko
d55c4e3973
Merge pull request #4275 from IvanSavenko/music_modding
...
Additional options for music modding
2024-07-18 21:28:04 +03:00
Laserlicht
4415f645a7
lambda -> function; fix color
2024-07-17 18:07:45 +02:00
Ivan Savenko
662254155a
Merge branch 'vcmi/master' into 'vcmi/develop'
2024-07-17 13:57:36 +00:00
Laserlicht
f54b84ead9
use spellbook to select
2024-07-17 13:20:17 +02:00
Ivan Savenko
63bcf7d83c
Replaced most of usages of CRandomGenerator with vstd::RNG in library
2024-07-16 13:13:07 +00:00
Ivan Savenko
ad9750ed3e
Merge pull request #4186 from SoundSSGood/end-of-battle-artifacts-transfer
...
End of battle artifacts transfer
2024-07-16 12:45:13 +03:00
Ivan Savenko
f920e94366
Merge pull request #4210 from Laserlicht/graphics_improvements
...
[1.6] Graphics improvements
2024-07-16 12:17:39 +03:00
Ivan Savenko
3134d8383c
Merge pull request #4207 from Laserlicht/map_format_additional
...
[1.6] Map format additional infos
2024-07-16 12:15:58 +03:00
Ivan Savenko
358008fca9
It is now possible to define multiple town themes
2024-07-15 21:45:51 +00:00
SoundSSGood
ff5ddd76b7
suggestions
2024-07-16 00:03:06 +03:00
Dydzio
037ee4395e
Allow opening single hero when two heroes in town via shift+click
2024-07-15 20:22:19 +02:00
Ivan Savenko
6b8f94e6e7
Merge remote-tracking branch 'vcmi/master' into develop
2024-07-11 17:43:44 +00:00
SoundSSGood
b42c6dbf44
fixed regressions
2024-07-09 14:27:05 +03:00
SoundSSGood
ef1fbffad4
ArtifactsUIController class
2024-07-09 14:27:05 +03:00
Laserlicht
3f0be7e904
invite hero scroll
2024-07-06 13:04:00 +02:00
Ivan Savenko
38bcc1e475
Restored logic of up/down key in town interface
2024-07-04 08:46:39 +00:00
Laserlicht
02bd52041b
extend map format
2024-06-29 13:13:59 +02:00
Ivan Savenko
2eeb6510c1
Warn in log instead of crash on invalid building ID from mod
2024-06-27 09:58:53 +00:00
Alexander Wilms
02e429e973
Fix typos using https://github.com/crate-ci/typos
...
Changes were reviewed manually
2024-06-24 03:47:19 +02:00
Ivan Savenko
3bea383b59
Merge branch 'vcmi/beta' into 'vcmi/develop'
2024-06-21 12:58:36 +00:00
Ivan Savenko
0d3408ee68
Add better runtime error on invalid building ID
2024-06-20 10:08:49 +00:00
Ivan Savenko
0af2f6d8dc
Fix crash on opening tavern window on some localizations
2024-06-17 17:09:42 +00:00
Ivan Savenko
b4c6906471
Merge branch 'vcmi/beta' into 'vcmi/develop'
2024-06-11 19:22:23 +00:00
Ivan Savenko
861ed7667d
Merge pull request #4095 from vcmi/master
...
Merge master -> beta
2024-06-05 23:54:21 +03:00
Ivan Savenko
a8dcbd8ff9
Merge pull request #4061 from Laserlicht/hota_buildings
...
Support HotA thives guild
2024-06-05 12:41:35 +03:00
SoundSSGood
a7239a6fcc
fix
2024-06-05 09:52:16 +03:00
Ivan Savenko
6c25552f84
Fix crash on closing game with open levelup dialog
2024-06-04 19:16:05 +00:00
Ivan Savenko
2288acef69
Merge pull request #4083 from IvanSavenko/recruitment_fix
...
[1.6] Fixes crash on accessing recruitment window via click on creature icon
2024-06-04 17:53:53 +03:00
Ivan Savenko
62dd5681f5
Fixes crash on accessing recruitment window via click on creature icon
2024-06-03 13:37:35 +00:00
Ivan Savenko
b8beb4fb13
Fixes for various minor issues detected by Sonar Cloud
2024-06-01 11:48:30 +00:00
Ivan Savenko
6b336b454e
Less ambiguous names for buttons in exchange window. Fixes swapped
...
button functions.
2024-06-01 07:39:43 +00:00
Ivan Savenko
df83fa33a1
Merge branch 'vcmi/master' into 'vcmi/develop'
2024-05-31 09:34:21 +00:00
Ivan Savenko
adc3441bda
Merge pull request #3998 from IvanSavenko/refactor_sdl_media
...
[1.6] Reorganize SDL sound/music/video handling
2024-05-31 12:02:55 +03:00
Laserlicht
9c1ce214fc
thievesGuild support
2024-05-30 21:58:35 +02:00
Ivan Savenko
5d6470e527
Merge pull request #4025 from IvanSavenko/shared_ptr_lib
...
[1.6] Use shared_ptr for library entities
2024-05-30 19:14:06 +03:00
SoundSSGood
07239dcfb5
artifact parts calc
2024-05-24 21:22:08 +02:00
Ivan Savenko
d1aa4ecd10
Merge pull request #4013 from IvanSavenko/shortcuts_additions
...
[1.5.2] Shortcuts additions
2024-05-21 14:18:55 +03:00
SoundSSGood
3692ca25ed
CArtifactsOfHeroBase refactoring
2024-05-21 12:05:07 +03:00
SoundSSGood
03aaf849f0
CWindowWithArtifacts remove std::variant
2024-05-20 15:15:46 +03:00
SoundSSGood
0501073d4c
Artifacts altar ctrl+click
2024-05-20 11:47:12 +03:00
Ivan Savenko
5feef488e3
Added Ctrl & Shift versions for swap artifacts shortcut. Exchange window
...
shortcuts now work even without vcmi extras
2024-05-19 12:28:03 +00:00
Ivan Savenko
d965226cbd
Moved Exchange Window to new file, no functionality changes
2024-05-19 10:53:56 +00:00
Ivan Savenko
6ba36cf6c0
Add separate shortcuts for adventure map and settings window
2024-05-19 09:12:36 +00:00
Ivan Savenko
0db8266495
Implemented some of the requested shortcuts
2024-05-19 09:12:36 +00:00
Ivan Savenko
88fbb7ee71
Most of buttons created in cpp now have assigned shortcut
2024-05-19 09:12:36 +00:00
Ivan Savenko
9bfe000724
Added semi-workaround method for network thread shutdown:
...
Currently closing game while network thread is waiting for something is
very bug-prone, since network thread may resume during shutdown and
access partially destroyed client state.
Now if exit has been requested, the very first step would be semi-
graceful shutdown of network thread (via exception throwing). This may
in theory skip some cleanup in non-RAII code, but since game is shutting
down this does not matters much.
This logic applies to:
- shutting down while network thread is waiting for dialogs
- shuttind down while network thread waiting for animations in combat
2024-05-18 11:04:10 +00:00
Ivan Savenko
7461df161c
lib now uses shared_ptr for entities. Removed manual memory management.
2024-05-17 15:04:05 +00:00
SoundSSGood
09bb9895ce
refactoring
2024-05-17 14:59:54 +03:00
SoundSSGood
6a1a6b6864
weak_ptr removed
2024-05-17 14:59:54 +03:00
SoundSSGood
7abfa7b42a
ArtifactPosition::TRANSITION_POS now is simple ArtSlotInfo
2024-05-17 14:59:51 +03:00
Ivan Savenko
540bd16e7b
Fixed video widget playback
2024-05-16 16:50:36 +00:00
Ivan Savenko
661a66121b
Cleaned up IVideoPlayed API to remove global state
2024-05-15 17:05:17 +00:00
Ivan Savenko
d08c7b7b8f
Added VideoWidget to hide implementation details
2024-05-15 17:05:16 +00:00
Ivan Savenko
d27b854cb1
Reorganized music, video and sound players:
...
- All XXXplayers are now in client/media directory
- Reogranized code on one class per file basis
- Extracted interfaces from handlers. Handlers now implement
corresponding interface.
- CCS now only stores pointer to an interface
2024-05-15 17:05:12 +00:00
Ivan Savenko
7790b8969d
Simplify TextInput constructor
2024-05-15 12:45:45 +00:00
Ivan Savenko
93c3cf372b
Reworked TextInput to allow text overflow support
2024-05-15 12:45:45 +00:00
Ivan Savenko
1abe9007bc
Moved CTextInput to a separate file. No changes in logic
2024-05-15 12:45:45 +00:00
Ivan Savenko
da9d82b697
Merge pull request #3973 from vcmi/master
...
Merge master -> beta
2024-05-14 16:59:10 +03:00
Ivan Savenko
0aa7362adf
Fix possible crash on accessing faction description
2024-05-12 20:24:09 +00:00
Ivan Savenko
7267e02b8d
Better handling of Ctrl / Cmd modifier keys on Apple systems:
...
- Test only for Cmd modifier key when processing mouse clicks
- Test both Ctrl and Cmd modifier key when processing keyboard input
- This logic is now used for all Apple systems - macOS and iOS
2024-05-12 17:09:31 +00:00
Ivan Savenko
64d6e48540
Fixed mouse double-click handling in some widgets.
...
Now double-click when 1st click was not inside widget should work as
expected:
- scenario list: 2nd click on non-selected scenario will select it
instead of starting unselected map
- component selection: 2nd click on non-selected component would select
it instead of confirming choice
- town portal dialog: 2nd click on non-selected town would only select
it
- tavern window: right-click would now also select this hero (h3 logic)
2024-05-10 16:05:59 +00:00
DjWarmonger
4949b98ed3
Merge pull request #3759 from Laserlicht/bio
...
Let's try this
2024-05-07 09:05:14 +02:00
SoundSSGood
03c6684622
Cosmetic market window fix
2024-05-03 12:36:13 +03:00
Ivan Savenko
74d3b4ab43
Added block for several more actions outside of our turn
2024-04-30 17:51:32 +03:00
Ivan Savenko
d53082e1c1
Block few more cases of access during another player turn in UI
2024-04-30 17:51:32 +03:00
SoundSSGood
7543e26d42
dismiss hero with fix
2024-04-28 19:01:14 +03:00
SoundSSGood
ce68b3f45d
class CArtifactsOfHeroMain : public CKeyShortcut
2024-04-27 21:35:38 +03:00
SoundSSGood
ce9d2d8ab8
Switching costume
2024-04-27 21:35:37 +03:00
SoundSSGood
25dea7e364
Saving costume
2024-04-27 21:35:37 +03:00
Laserlicht
ab50bf9198
biography to description
2024-04-27 18:41:21 +02:00
SoundSSGood
c9a8f8e855
Sonarcloud warnings
2024-04-23 22:21:46 +03:00
SoundSSGood
20471c9c2f
virtual CWindowObject
2024-04-23 18:58:41 +03:00
SoundSSGood
25d2b468c3
CWindowWithArtifacts preparations
2024-04-23 16:06:58 +03:00
Ivan Savenko
0824f50367
Merge pull request #3779 from SoundSSGood/backpackWindow-art-transfer-fix
...
Backpack window cursor fix
2024-04-18 15:18:36 +03:00
Ivan Savenko
3724742247
Merge pull request #3774 from Laserlicht/fix_city_gate
...
fix city gate
2024-04-18 15:09:53 +03:00
SoundSSGood
e8eb638bf1
backpack window cursor fix
2024-04-17 16:11:33 +03:00
Laserlicht
f847068e92
fix city gate
2024-04-16 00:54:04 +02:00
Dydzio
b351946afd
Add some utility bonuses for player resources boosting
2024-04-15 21:18:45 +02:00
Ivan Savenko
8003d0d7ca
Restore handling of double-clicks in message boxes
2024-04-14 13:09:39 +03:00
Ivan Savenko
ae8779779b
Fix typo in file names
2024-04-14 13:09:11 +03:00
Laserlicht
e4b60baa3b
creature/town biography/description
2024-04-12 23:35:39 +02:00
Ivan Savenko
a7d47cd3d2
Merge pull request #3742 from IvanSavenko/adventure_map_spellcast_fixes
...
Adventure map spellcasting fixes
2024-04-12 11:17:19 +03:00
SoundSSGood
6a0e8b0cab
Junkyard crash fixed
2024-04-11 01:44:15 +03:00
Ivan Savenko
8353bca34f
Small refactoring of adventure map spell casting:
...
- Removed duplicated checks for DD possibility
- Moved most of spell-specific code from AdventureMapInterface to library
code
- AdventureSpellMechanics class now provides methods to check whether
spellcast is possible, similarly to battle spells
- If it is not possible to cast adventure map spell (e.g. no mana or no
move points) game will show infowindow immediately on clicking spellbook
instead of on cast attempt
- If hero does not have movement points for a DD, game will show correct
error message
- Added game settings 'dimensionDoorFailureSpendsPoints' due to
discovered H3 logic
2024-04-10 20:04:08 +03:00
SoundSSGood
39a0e56169
suggested changes
2024-04-08 14:57:58 +03:00
SoundSSGood
2cdf2b4083
fixed missed trader text
2024-03-25 17:38:43 +02:00
SoundSSGood
c6c213c454
CMarketBase::hRight CMarketBase::hLeft removed. Final changes
2024-03-25 12:56:46 +02:00
SoundSSGood
cc14f85445
Refactoring. Regressions fixing.
2024-03-25 12:55:05 +02:00
SoundSSGood
433d55cac3
Market window unified
2024-03-25 12:44:34 +02:00
SoundSSGood
ae8d70748b
Altar artifacts widget refactoring
2024-03-25 12:44:33 +02:00
SoundSSGood
4839891de4
Cleanup & refactoring
2024-03-25 12:44:33 +02:00
SoundSSGood
f3fa6714dc
Artifacts selling widget
2024-03-25 12:44:33 +02:00
SoundSSGood
bb7137545f
Artifacts market widget
2024-03-25 12:44:33 +02:00
SoundSSGood
4e0ea7355b
Transfer resources widget
2024-03-25 12:44:33 +02:00
SoundSSGood
4d3bf882ed
market resources widget
2024-03-25 12:44:33 +02:00
SoundSSGood
6b658bf9c1
freelancer guild widget
2024-03-25 12:44:33 +02:00
SoundSSGood
0813fdbf8c
market window
2024-03-25 12:44:33 +02:00
Ivan Savenko
4b2cba96cc
Merge pull request #3646 from IvanSavenko/configurable_button
...
Configurable buttons
2024-03-04 13:34:40 +02:00
Ivan Savenko
83eb0ea28f
Merge pull request #3625 from IvanSavenko/exchange_in_town
...
Better hero exchange in town
2024-03-04 13:34:15 +02:00
Ivan Savenko
22f23ba6f8
Restore previously disabled functionality
2024-02-29 16:47:44 +02:00
Ivan Savenko
ddb2acb9c2
Code cleanup
2024-02-29 15:39:13 +02:00
Ivan Savenko
20008cd5a5
Replaced premade buttons on hero screen with generated ones
2024-02-29 13:57:25 +02:00
Ivan Savenko
0051ffa7a9
Implemented configurable buttons. Replaced 'animateLonelyFrame' logic.
2024-02-29 13:57:25 +02:00
Ivan Savenko
07d201502e
Refactoring of button class to prepare for configurable button
2024-02-29 13:57:25 +02:00
Ivan Savenko
658747d342
Code cleanup
2024-02-27 14:45:15 +02:00
Ivan Savenko
99cb1df91d
Fixes for positioning on popups with components
2024-02-27 13:15:16 +02:00
Ivan Savenko
93b3cb3af5
Better size & positioning of infoboxes
2024-02-26 22:04:30 +02:00
Ivan Savenko
4b4dedeab9
Code formatting
2024-02-26 18:53:12 +02:00
Ivan Savenko
e6b339448f
Refactoring & deduplication of infowindow code
2024-02-26 18:32:15 +02:00
Ivan Savenko
658cc14cd0
Removed direct usage of SDL_Surface in info windows
2024-02-26 15:49:27 +02:00
Ivan Savenko
5419df1140
Removed no longer used class
2024-02-26 15:49:27 +02:00
Ivan Savenko
82eea1abc1
Remove unused variable
2024-02-19 16:49:59 +02:00
Ivan Savenko
8b60275a6e
Hero exchange in town is now activated by clicking on hero portrait
2024-02-18 21:02:24 +02:00
Ivan Savenko
af671d109f
Made graphical primitive-based UI more configurable
2024-02-18 20:48:45 +02:00
Ivan Savenko
4c70abbeb5
Reduced usage of global variables - removed or made const / constexpr
2024-02-12 13:49:45 +02:00
Ivan Savenko
6e399eb21a
Make some non-const static variables const or constexpr
2024-02-12 13:22:54 +02:00
Ivan Savenko
f2ecd4cf11
Merge branch 'develop' into 'lobby'
2024-02-11 16:13:13 +02:00
Alexander Wilms
522cb571b3
Remove redundant virtual specifiers
...
`grep -nr virtual | grep -v googletest | grep override > ../redundant_virtual.txt`
```python
import os
with open("../redundant_virtual.txt") as f:
for line in f:
print()
line: str = line.strip()
print(line)
tmp = line.split(":")
file = tmp[0].strip()
code = tmp[-1].strip()
print(file)
print(code)
new_code = code.replace("virtual ", "", 1)
# https://superuser.com/a/802490/578501
command = f"export FIND='{code}' && export REPLACE='{new_code}' && ruby -p -i -e \"gsub(ENV['FIND'], ENV['REPLACE'])\" {file}"
os.system(command)
```
2024-02-10 20:46:13 +01:00
Alexander Wilms
0495c52cf4
Don't call ScreenHandler::onScreenResize() when the window has been (un)maximized to avoid creating a huge texture and crashing
2024-02-05 18:59:55 +01:00
Ivan Savenko
d4bedd8d8d
Fixed handling of match server crash
2024-02-04 19:58:09 +02:00
Ivan Savenko
80fc2bb695
Merge remote-tracking branch 'vcmi/develop' into lobby
2024-02-03 21:11:34 +02:00
Ivan Savenko
7247038458
Merge pull request #3574 from SoundSSGood/altar-fixes
...
Artifacts altar related fixes
2024-02-01 22:27:41 +02:00
Ivan Savenko
facdc9f993
Merge pull request #3583 from Laserlicht/town_portal
...
town portal dialog adjustments
2024-02-01 11:30:51 +02:00
Laserlicht
9e7fbc3ca2
use localstate
2024-01-31 21:29:04 +01:00
Laserlicht
9cd6a6838b
fix
2024-01-31 11:32:35 +01:00
Laserlicht
ebb2cce8b8
rework town portal
2024-01-31 02:30:10 +01:00
Ivan Savenko
7992144763
Gem class is now Sorceress
2024-01-30 23:34:27 +02:00
Ivan Savenko
3abc26e789
Moved checks for campaign heroes to CGHeroInstance class
2024-01-30 23:33:58 +02:00
Ivan Savenko
26703af8b0
Merge pull request #3576 from Alexander-Wilms/conditional-screen-clearing
...
CVideoHandler: Call SDL_RenderClear() when playing intro, call SDL_Re…
2024-01-30 17:36:18 +02:00
SoundSSGood
d16632b54c
cleanup & fix build & sonarcloud fixes
2024-01-30 01:23:50 +02:00
Alexander Wilms
70ce090bc4
CVideoHandler: Use EVideoType::INTRO and EVideoType::SPELLBOOK
2024-01-29 16:08:53 +01:00
SoundSSGood
f66918ea14
bulk move to altar
2024-01-27 15:28:23 +02:00
Laserlicht
a2fd5039ab
setting
2024-01-27 01:16:55 +01:00
Ivan Savenko
322c5faf63
Merge remote-tracking branch 'vcmi/develop' into lobby
2024-01-26 16:52:23 +02:00
Ivan Savenko
388ca6e776
Added list of active accounts and rooms to UI. Added room creation logic
2024-01-26 16:32:36 +02:00
Ivan Savenko
4d0c0f10a9
Merge pull request #3530 from Laserlicht/tavern
...
Invite hero
2024-01-26 13:12:55 +02:00
Laserlicht
e434d5c0b7
Apply suggestions from code review
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-01-25 20:35:30 +01:00
Laserlicht
7d1553bc29
fix build
2024-01-22 20:56:35 +01:00
Laserlicht
9b2908d464
Apply suggestions from code review
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-01-22 20:19:49 +01:00
Laserlicht
0a4b5dbe10
code review
2024-01-21 18:12:46 +01:00
Ivan Savenko
fc4ae3bd8c
Merge remote-tracking branch 'vcmi/develop' into lobby
2024-01-20 23:01:49 +02:00
Ivan Savenko
0c07384293
Refactoring of serialization versioning handling
...
- Removed 'version' field from serialize() method
- Handler classes - Binary(De)Serializer now have 'version' field
- Serialization versioning now uses named enum
Save compatibility with 1.4.X saves should be intact
2024-01-20 20:34:51 +02:00
Ivan Savenko
6b760089a4
Merge pull request #3473 from IvanSavenko/const_lib
...
[1.5] Remove non-const global variables from library
2024-01-20 19:22:46 +02:00
Laserlicht
883ea23495
moved to gameconfig
2024-01-20 17:54:15 +01:00
Laserlicht
a0098eb065
Gui for hero invite
2024-01-20 12:54:06 +01:00
Laserlicht
346beea49c
invite hero backend
2024-01-20 01:09:55 +01:00
Laserlicht
1fb2a026ec
enable doubleclick
2024-01-19 23:31:21 +01:00
Ivan Savenko
55b504792e
Implemented basic version of login window and persistent connection on
...
client
2024-01-19 23:49:59 +02:00
Ivan Savenko
1f7e53a609
Code style fixes
2024-01-19 21:21:23 +02:00
Ivan Savenko
6e629a6a5f
split getBonusLocalFirst into two distinct method:
...
- const method getFirstBonus that returns single matching bonusToString
- non-const method getLocalBonus that returns bonus from current node
2024-01-19 13:56:06 +02:00
Ivan Savenko
a15366f5a5
Make IObjectInterface::cb non-static
2024-01-19 13:55:21 +02:00
Ivan Savenko
bd5682ecc3
Merge remote-tracking branch 'vcmi/master' into develop
2024-01-19 13:49:54 +02:00
Ivan Savenko
3e8f110482
Merge pull request #3515 from SoundSSGood/backpack-statusbar
...
Backpack statusbar
2024-01-18 16:05:42 +02:00
SoundSSGood
a753319ad0
backpack window statusbar
2024-01-18 15:55:54 +02:00
Laserlicht
a1f4fcb78a
hide adventuremap
2024-01-18 00:47:18 +01:00
Alexander Wilms
7a1cee1a60
Fix error: 'auto' not allowed in non-static struct member
2024-01-17 14:49:28 +00:00
Alexander Wilms
73019c204d
Replace redundant types with auto for the lvalues of template factory functions for smart pointers
...
grep -r --include \*.h --include \*.cpp "= std::" * | grep -v auto | grep -Po ".*[^ ]+ [^ ]+ [^ ]*[ ]*=.*;" | grep -v "auto\|int\|char\|bool\|float|\double\|for\|if\|googletest\|fuzzylite\|size_t\|using\|return" | grep -v double | grep -v si64 | grep -v si32 | grep -v ui32 | grep \< | grep -v float | tr -d '\t' | grep -v assert > redundant_types.txt
import re
with open("redundant_types.txt") as f:
for line in f:
line = line.strip()
path = line.split(":", 1)[0]
original_code = ":".join(line.split(":")[1:]).strip()
print()
print(path)
print(original_code)
prefix = "auto "
if original_code.startswith("static"):
static = True
else:
static = False
cpp_type = " ".join(original_code.split("=")[0].strip().split(" ")[0:-1])
print(cpp_type)
if static:
new_code = "static auto "+ " ".join(original_code.split(" ")[2:])
else:
new_code = "auto "+ " ".join(original_code.split(" ")[1:])
print(new_code)
if True:
with open(path, "r") as f:
filedata = f.read()
filedata = filedata.replace(original_code, new_code)
with open(path, "w") as f:
f.write(filedata)
2024-01-17 12:50:00 +00:00
Ivan Savenko
0d0d3d8c80
Renamed speed -> getMovementRange, remove misleading default parameter
2024-01-14 17:14:36 +02:00
Ivan Savenko
7cf738b20e
Merge pull request #3462 from Laserlicht/trim_text
...
limit textboxes
2024-01-12 21:53:30 +02:00
Ivan Savenko
019a4151b9
Merge pull request #3258 from SoundSSGood/trade-panels
...
Market rework
2024-01-12 21:53:13 +02:00
SoundSSGood
b840cf3650
suggested changes
2024-01-11 12:46:32 +02:00
Alexander Wilms
f3277b7953
Define each identifier in a dedicated statement
2024-01-10 00:22:23 +00:00
SoundSSGood
fdf60b2151
moved to widgets/markets
2024-01-09 20:21:09 +02:00
SoundSSGood
d0ca63d2c9
subclasses for market composition
2024-01-08 16:24:47 +02:00
SoundSSGood
50a5c72d1b
Creatures trade panel
2024-01-08 16:24:47 +02:00
SoundSSGood
791ee78cc4
players trade panel
2024-01-08 16:24:47 +02:00
SoundSSGood
f043c417a1
Artifacts trade panel
2024-01-08 16:24:47 +02:00
SoundSSGood
b246e24811
reworking slot selection
2024-01-08 16:24:47 +02:00
SoundSSGood
6c828d1be9
Resources trade panel
2024-01-08 16:24:47 +02:00
Laserlicht
24d4816a36
trim text
2024-01-07 23:42:48 +01:00
Ivan Savenko
a2f603ac02
Fixed some cases of illegal access to std::array::operator[]
2024-01-07 12:45:02 +02:00
Laserlicht
9066dbcbd4
spellbook fix pages
2024-01-01 14:57:55 +01:00
Ivan Savenko
a9005da01e
Merge pull request #3366 from Laserlicht/battle_informations
...
Battle stacks informations
2023-12-28 12:39:26 +02:00
Dydzio
046d3abee4
Add new setting for instant adventure map fade in / fadeout effects
2023-12-24 17:18:48 +01:00
Laserlicht
39c58a9d94
disable animation button
2023-12-24 00:41:29 +01:00
Laserlicht
f0c97b344a
add duration + morale/luck
2023-12-23 16:07:12 +01:00
Laserlicht
c20f0bdc3e
using CHeroArea
2023-12-22 01:30:41 +01:00
Laserlicht
f75ccc308b
right click opens hero info
2023-12-22 00:07:41 +01:00
Ivan Savenko
27d2fc0a13
Merge pull request #3186 from SoundSSGood/quick-backpack-part1
...
Quick backpack window
2023-12-21 17:10:15 +02:00
Laserlicht
c6434c31fb
small fix
2023-12-20 20:34:57 +01:00
Laserlicht
1dd2a28760
small fix
2023-12-20 20:23:35 +01:00
Laserlicht
ed671fa2fa
big spellbook optimize
2023-12-20 20:16:23 +01:00
SoundSSGood
e5c532beb4
gesture for quick backpack window
2023-12-20 16:55:38 +02:00
SoundSSGood
21b02414bf
Refactoring. Callbacks have been encapsulated. Added cursorPosition
2023-12-19 19:01:56 +02:00
SoundSSGood
29b61081f3
Quick backpack
2023-12-19 19:01:56 +02:00
Ivan Savenko
732cdfec73
Merge pull request #3254 from Laserlicht/spell_search
...
search spells
2023-12-18 13:23:06 +02:00
Laserlicht
77505af71b
remove removefoucs
2023-12-17 22:17:32 +01:00
Laserlicht
9299eaed36
code review
2023-12-16 21:10:27 +01:00
Laserlicht
56562ad8dc
date time format
2023-12-16 18:57:38 +01:00
Ivan Savenko
4fa33c8d2e
Merge pull request #3279 from Laserlicht/smooth_scroll_fix
...
smooth scroll fix and gui option to disable
2023-12-10 22:49:43 +02:00
Laserlicht
df2a5f05d8
audio mute on focus lost setting
2023-12-10 14:49:27 +01:00
Laserlicht
e74c2262c3
add option to gui to disable smooth dragging
2023-12-10 13:38:58 +01:00
Laserlicht
dfb10bdfcb
search rectangle
2023-12-08 22:52:34 +01:00
Laserlicht
95ff89f622
search spells
2023-12-08 22:46:05 +01:00
Ivan Savenko
0fd966818f
Remove 'visible' property from images, replaced with enable/disabled
...
call
2023-12-07 13:57:16 +02:00
Ivan Savenko
d919cb0eac
Merge pull request #3240 from IvanSavenko/bugfixing
...
[1.4.0] Bugfixing for beta
2023-12-02 12:20:37 +02:00
Ivan Savenko
55ad903ffb
Merge pull request #3231 from dydzio0614/large-spellbook-setting
...
Split large spellbook from UI enhancements setting
2023-12-02 12:13:06 +02:00
Dydzio
fc035b1b55
Change large spellbook config section to gameTweaks
2023-11-28 22:30:50 +01:00
Ivan Savenko
ea8995e901
Fixed check for free slots when recruiting in towns
2023-11-28 16:25:11 +02:00
Ivan Savenko
d5f8db2222
Fixed undefined behavior on accessing array with -1 index
2023-11-27 14:09:08 +02:00
Ivan Savenko
344d8891e4
Fix display of creatures to sell in Freelancer Guild
2023-11-27 14:08:49 +02:00
Ivan Savenko
81a48f2d80
Do not attempt to resize text box to zero-width
2023-11-27 14:08:49 +02:00
Dydzio
a4d76b2529
Split large spellbook from UI enhancements setting
2023-11-26 19:16:53 +01:00
Laserlicht
2eada0efca
allow shortcout if any town has a marketplace
2023-11-25 03:14:31 +01:00
Laserlicht
1954447a9e
fix image order
2023-11-25 02:58:06 +01:00
Ivan Savenko
07990644b5
Merge pull request #3191 from Laserlicht/touch-introduction
...
Touch introduction
2023-11-20 14:05:47 +02:00
Laserlicht
70b6906e6d
adjust messages, add radial wheel
2023-11-17 18:23:11 +01:00
Laserlicht
a6dd5c2887
translation
2023-11-16 23:03:41 +01:00
Laserlicht
1bf05d43a1
fix video implementation error; implement paging; video loading
2023-11-16 22:39:50 +01:00
Laserlicht
2cfbcd067b
videos
2023-11-16 02:58:43 +01:00
Ivan Savenko
52050d0ef1
Fix build
2023-11-15 15:55:19 +02:00
Ivan Savenko
6cb1f6ff11
Remove all remaining implicit conversion in lib
2023-11-15 15:55:19 +02:00
Laserlicht
05efb12d82
format fix
2023-11-14 22:50:22 +01:00
Laserlicht
cb92778e00
add ui
2023-11-14 22:39:11 +01:00
Laserlicht
f7a31865f3
basic touch introduction implementation
2023-11-14 21:52:30 +01:00
Ivan Savenko
07472d3b05
Merge pull request #3147 from IvanSavenko/serialization_refactor
...
Serialization refactor - remove VLC from saved games
2023-11-11 17:35:01 +02:00
Ivan Savenko
5c810df36f
Reorganized types registration code
2023-11-11 00:39:08 +02:00
Ivan Savenko
864462b84a
Reduce excessive updates of garrisons. Fixes selection reset in simturns
2023-11-09 00:01:48 +02:00
Ivan Savenko
6b81012f31
Use variant identifier in netpacks where applicable
2023-11-08 14:00:23 +02:00
SoundSSGood
41ee52d9d4
fix build & suggested changed
2023-11-08 01:51:13 +02:00
SoundSSGood
539b2e596d
adjusting the placement of artifact slots
2023-11-06 14:31:32 +02:00
SoundSSGood
75ebd954af
Creatures altar & Artifacts altar
2023-11-06 14:31:32 +02:00
SoundSSGood
9f9317a8a0
CTradeBase initial commit
2023-11-06 14:31:31 +02:00
Ivan Savenko
5487f07d3b
added toEntity overload that accepts generic Services class
2023-11-04 17:04:53 +02:00
Ivan Savenko
184f5a72cc
Use toEntity/toXXX methods in Identifier instead VLC objects access
2023-11-03 16:03:29 +02:00
Ivan Savenko
87f6c7354b
Merge pull request #3139 from IvanSavenko/component_variant_identifier
...
Refactoring of Component class
2023-11-03 15:52:07 +02:00
Ivan Savenko
4a24da3804
Merge pull request #3114 from Laserlicht/fix-highscore
...
fix high scores screen
2023-11-03 15:51:37 +02:00
Ivan Savenko
056ef00f74
Bugfixing
2023-11-02 13:52:58 +02:00
Ivan Savenko
10e50548e7
Converted Component class to use VariantIdentifier instead of int
2023-11-02 12:00:04 +02:00
