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
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
