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
Ivan Savenko
8346d71c98
Remove more subID access
2023-11-01 14:44:05 +02:00
Ivan Savenko
7107b3202f
Merge pull request #3069 from SoundSSGood/artifact-location-id
...
ArtifactLocation now use ID for artHolder identification
2023-11-01 14:41:36 +02:00
Laserlicht
8a9f10ec3a
fix asset failures
2023-10-31 22:05:22 +01:00
SoundSSGood
3c5527a222
ArtifactLocation now use ID for artHolder identification part3
2023-10-29 17:46:13 +02:00
SoundSSGood
ab2f6abb87
ArtifactLocation now use ID for artHolder identification part2
2023-10-29 17:46:13 +02:00
SoundSSGood
61fc236d79
ArtifactLocation now use ID for artHolder identification part1
2023-10-29 17:46:13 +02:00
Alexander Wilms
5cbc75d3b7
Merge remote-tracking branch 'upstream/develop' into develop
2023-10-29 13:35:37 +00:00
Alexander Wilms
10ad5b6789
client/windows/CCastleInterface.cpp: Identical sub-expressions on both sides of operator "&&".
...
Identical expressions should not be used on both sides of a binary operator
2023-10-27 18:19:17 +00:00
Ivan Savenko
5523f05284
Moved ArtifactLocation to a separate file
2023-10-23 19:02:28 +03:00
Ivan Savenko
b88a8da4e8
Split off some netpack structures into separate files
2023-10-23 13:59:15 +03:00
Ivan Savenko
3880ea58b9
Merge branch 'josch/dos2unix' into develop
2023-10-22 18:39:03 +03:00
Ivan Savenko
3867e512f7
Merge pull request #3064 from IvanSavenko/bonus_metaidentifier
...
Type-safe bonus system
2023-10-22 18:34:12 +03:00
Ivan Savenko
a70ad7202f
Merge pull request #3088 from Laserlicht/non_squared
...
Minimap keep aspect ratio (Letterboxing)
2023-10-22 16:55:58 +03:00
Ivan Savenko
ac925bb786
Renamed new types for consistency with code style
2023-10-22 16:55:19 +03:00
Ivan Savenko
b394158dc9
Bonus Source ID now uses metaidentifier
2023-10-22 16:55:18 +03:00
Ivan Savenko
77facf9387
Implement missing functions, fixes linking errors
2023-10-22 16:54:56 +03:00
Ivan Savenko
454ba44ac5
Merge pull request #2988 from IvanSavenko/configurable_extensions
...
Extension of configurable object functionality
2023-10-22 16:24:47 +03:00
Laserlicht
e03f2a9d3a
improvements for non quadratic maps
2023-10-21 16:49:50 +02:00
Nordsoft91
12b179ef1f
Merge pull request #3057 from Laserlicht/rw_hero
2023-10-20 01:42:06 +02:00
Johannes Schauer Marin Rodrigues
a1a5bc28c2
convert line endings from CRLF (Windows) to LF (Linux/Unix)
...
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.
This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.
Files that are Windows specific like *.vcxproj and *.props files were
not converted.
Closes : #3073
2023-10-19 16:23:21 +02:00
Ivan Savenko
e0f6b582f5
Display object description only on right-click
2023-10-19 14:36:11 +03:00
Ivan Savenko
0f2922d064
Only show components if UI enhancements is on
2023-10-19 13:33:49 +03:00
Laserlicht
464577be28
new icons
2023-10-17 20:06:35 +02:00
Ivan Savenko
927ce4e60e
Improvements to rewardable objects popups
2023-10-16 23:55:37 +03:00
Nordsoft91
ee997a291c
Merge pull request #3045 from Laserlicht/interface_improvement
...
various interface shortcuts
2023-10-15 23:48:22 +02:00
Laserlicht
efcf6b71d7
formatting
2023-10-15 12:58:07 +02:00
Laserlicht
dd0033296f
docs
2023-10-15 12:28:13 +02:00
Laserlicht
5ae646bd15
Update client/windows/GUIClasses.cpp
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-10-15 12:19:44 +02:00
Laserlicht
23e1b0b0d5
radial wheel for hero
2023-10-15 02:43:42 +02:00
Laserlicht
78026f40eb
name opens town itself
2023-10-15 00:41:17 +02:00
Laserlicht
c96cc405ed
town now updates
2023-10-14 23:41:12 +02:00
Nordsoft91
aa25ab6488
Merge pull request #3035 from Nordsoft91/quests
...
Quests rework
2023-10-14 21:38:15 +02:00
Laserlicht
5a84e7cd7f
Update client/windows/GUIClasses.cpp
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-10-13 19:56:56 +02:00
Laserlicht
3c117da4eb
fix tavern
2023-10-13 19:56:56 +02:00
Laserlicht
9e508fe2c2
interface improvements
2023-10-13 19:56:56 +02:00
Nordsoft91
802e1bb961
Merge pull request #3042 from Laserlicht/crash_preview
...
[fix] crash with custom campaign preview
2023-10-13 10:57:02 +02:00
Nordsoft91
ab36692847
Merge pull request #3037 from Laserlicht/missing_res
2023-10-13 10:36:33 +02:00
nordsoft
fadf086e61
Fix review comments
2023-10-12 13:30:01 +02:00
nordsoft
7ccd4cdcb2
Refactor quests progress
2023-10-11 21:10:42 +02:00
Nordsoft91
ecd01fd53c
Merge pull request #3039 from Laserlicht/townhall_click
2023-10-11 18:43:59 +02:00
Laserlicht
abab917ef9
fix crash with custom campaign preview
2023-10-11 11:23:38 +02:00
nordsoft
bb238f9b72
New quests work
2023-10-10 23:44:29 +02:00
Laserlicht
8a3e58cd5e
red is the most liked color
2023-10-10 23:15:40 +02:00
Laserlicht
926bf71814
make townhall clickable
2023-10-10 21:02:40 +02:00
Laserlicht
25f7bb40d0
new layout
2023-10-09 22:50:07 +02:00
Laserlicht
fa9d5e9971
show missing resources
2023-10-09 21:43:43 +02:00
nordsoft
d7d435dcb7
Add game pause
2023-10-08 16:03:57 +02:00
Ivan Savenko
b75a67ef7c
Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor
...
Improvements to type safety of Identifier class
2023-10-05 00:33:07 +03:00
Ivan Savenko
037efdf5fc
Improvements to type safety of Identifier class
...
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
Ivan Savenko
39a92cdde3
Add query for dwellings dialog
2023-10-04 17:47:12 +03:00
Ivan Savenko
898733eed7
Added Query to track visit duration for Taverns and Markets
2023-10-04 17:47:12 +03:00
Ivan Savenko
e322d0a084
Merge pull request #2966 from IvanSavenko/simplify_ui_lock
...
Simplified locking of game UI state
2023-10-04 16:50:23 +03:00
Laserlicht
ec8580b99e
Merge branch 'develop' into patch-4map_overview_rework
2023-10-02 21:03:16 +02:00
Laserlicht
12ca3ea0ec
pos from texture
2023-10-01 19:44:04 +02:00
Laserlicht
cbd014ac88
code review
2023-10-01 17:35:56 +02:00
Laserlicht
23b8a321f6
file ending
2023-10-01 00:46:29 +02:00
Laserlicht
648a37310f
description
2023-10-01 00:35:11 +02:00
Laserlicht
65c21064b5
added var
2023-10-01 00:18:25 +02:00
Laserlicht
58dfc55ca3
only calc minimaps once
2023-09-30 23:50:27 +02:00
Laserlicht
61aae7bccc
code review
2023-09-30 22:49:22 +02:00
Laserlicht
8b835c9253
load game support
2023-09-30 20:03:33 +02:00
Laserlicht
c6adcc40f5
add date; cleanup
2023-09-30 17:56:51 +02:00
Laserlicht
79e66c38df
layout
2023-09-30 17:14:22 +02:00
Laserlicht
718bafc8af
map overview rework
2023-09-30 15:05:12 +02:00
nordsoft
0ac893b80f
Rumors meta string
2023-09-27 23:22:45 +02:00
Ivan Savenko
d6b9fa8fbd
Replaced CPlayerInterface::pim with CGuiHandler::interfaceLock
...
- Removed CPlayerInterface::pim since this lock does not actually
protects LOCPLINT but rather entire game UI state
- added more logical CGuiHandler::interfaceLock
- interface lock is now non-recursive and is locked only once by initial
caller that want to access GUI
2023-09-27 18:33:52 +03:00
Ivan Savenko
97097c20ad
Merge pull request #2874 from SoundSSGood/exchange-window-update
...
Exchange window update
2023-09-27 15:50:52 +03:00
Ivan Savenko
efe3393408
Merge pull request #2947 from Laserlicht/enableUiEnhancements_button
...
enableUiEnhancements button
2023-09-27 15:47:25 +03:00
Laserlicht
7cf654992f
code review
2023-09-25 16:34:36 +02:00
Laserlicht
5061792cce
enableUiEnhancements button
2023-09-25 13:11:08 +02:00
Laserlicht
28f4046937
ready
2023-09-25 01:04:06 +02:00
Laserlicht
3e4a5b7d80
border and variable
2023-09-25 00:31:32 +02:00
Laserlicht
a6b68be2df
offsets
2023-09-24 23:50:50 +02:00
Laserlicht
8b5c9db21b
basic offset
2023-09-24 23:15:09 +02:00
Laserlicht
240d291de9
big spellbook
2023-09-24 22:24:51 +02:00
Ivan Savenko
42d9ba6c82
Merge pull request #2877 from IvanSavenko/simturn_fixes
...
Changes for simturns support
2023-09-20 22:09:25 +03:00
Ivan Savenko
7b37c2353a
Merge pull request #2865 from IvanSavenko/market_ownership_check_fix
...
Cleaned up and fixed ownership checks for market netpack
2023-09-19 23:43:33 +03:00
Ivan Savenko
2af7d7c085
Ignore garrison update events of another towns for our castleInt
2023-09-19 19:24:35 +03:00
SoundSSGood
6280e778dc
fix build
2023-09-19 16:04:37 +03:00
SoundSSGood
9cc623c981
Fixed move checks. Backpack buttons.
2023-09-19 13:31:59 +03:00
SoundSSGood
f47def3588
refactoring
2023-09-19 13:31:57 +03:00
SoundSSGood
a83f290e13
bulk move artifacts only equipped, only backpack
2023-09-19 13:31:42 +03:00
Ivan Savenko
3d04e9c9ed
Cleaned up and fixed ownership checks for market netpack
2023-09-18 17:22:30 +03:00
Laserlicht
5125bcc67f
added probabilities
2023-09-17 23:01:18 +02:00
Laserlicht
7978e5a9b7
adjusted army and warmachine space
2023-09-17 21:55:35 +02:00
Laserlicht
21f37cfafb
simplified
2023-09-17 21:41:55 +02:00
Laserlicht
05fad115b5
Added new Widgets an functions for simplification
2023-09-17 20:34:31 +02:00
Laserlicht
d33101187b
simplify
2023-09-17 16:55:26 +02:00
Laserlicht
a994fa00aa
fixes; translation
2023-09-17 16:15:17 +02:00
Laserlicht
69da4d59bf
basic function ready
2023-09-17 15:28:05 +02:00
Laserlicht
cfc5bac540
layout
2023-09-17 14:31:07 +02:00
Laserlicht
59b5c46a32
right side draft
2023-09-17 13:22:39 +02:00
Laserlicht
79e872da68
left side ready
2023-09-17 04:10:08 +02:00
Laserlicht
b674682fe3
left side
2023-09-17 03:21:29 +02:00
Laserlicht
73fe924544
draw background
2023-09-17 02:14:03 +02:00
Laserlicht
ff96b1af0a
initial hero overview
2023-09-17 00:32:10 +02:00
Nordsoft91
717a765123
Merge pull request #2813 from Laserlicht/textcolor
...
Textcolor support
2023-09-16 14:12:17 +02:00
Laserlicht
063c7f3ca0
move function; optional; json static
2023-09-15 15:27:26 +02:00
Laserlicht
922a775108
Update CMessage.h
2023-09-15 15:27:26 +02:00
Laserlicht
f5505c9f6d
support for predefined colors
2023-09-15 15:27:26 +02:00
Laserlicht
f776422c67
color linesplit
2023-09-15 15:27:26 +02:00
Laserlicht
d948cb72a0
Alignment
2023-09-15 15:27:26 +02:00
Laserlicht
39838fdd3c
extend for all selections
2023-09-15 15:24:17 +02:00
Laserlicht
03316c62bf
Easy choosing for a secondary skill in Level Up Dialog by double clicking it
2023-09-15 15:24:17 +02:00
Ivan Savenko
f8541d0ae4
Merge branch 'vcmi/master' into 'vcmi/develop'
2023-09-15 13:59:02 +03:00