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
80e6485965
MetaIdentifier now uses std::variant internally
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
Ivan Savenko
8752551786
Merge pull request #3086 from Laserlicht/show_random
...
show random maps
2023-10-22 12:29:31 +03:00
Ivan Savenko
acc8e9db32
Merge pull request #3082 from SoundSSGood/crash-hotfix
...
Сrash fixed and little optimization
2023-10-22 12:01:28 +03:00
Ivan Savenko
07cd894024
Merge pull request #3090 from Laserlicht/fix_town_selection
...
[fix] no town selection on loadscreen
2023-10-22 12:01:00 +03:00
Laserlicht
0b0082eebc
format
2023-10-22 00:22:49 +02:00
Laserlicht
ab59c153b3
fix
2023-10-22 00:22:16 +02:00
Laserlicht
05a9f0fe39
move to EventReceiver
2023-10-22 00:05:14 +02:00
Laserlicht
6939989026
try to fix
2023-10-21 23:37:59 +02:00
Laserlicht
a042cc46c2
no town selection on loadscreen
2023-10-21 19:10:02 +02:00
Laserlicht
d215ffa011
optics
2023-10-21 18:45:45 +02:00
Laserlicht
737525756f
fix redraw
2023-10-21 17:28:23 +02:00
Laserlicht
e03f2a9d3a
improvements for non quadratic maps
2023-10-21 16:49:50 +02:00
Laserlicht
86e6f7d156
fix
2023-10-21 02:26:03 +02:00
Laserlicht
ceb70af528
fix
2023-10-21 02:22:22 +02:00
Laserlicht
9a116f9b20
small optimisation
2023-10-21 02:16:42 +02:00
Laserlicht
0eba0ee686
show random maps
2023-10-21 02:12:34 +02:00
Nordsoft91
f3acc939b9
Merge pull request #3062 from Laserlicht/sort_towns
...
sort town/hero feature
2023-10-20 22:51:26 +02:00
Nordsoft91
12b179ef1f
Merge pull request #3057 from Laserlicht/rw_hero
2023-10-20 01:42:06 +02:00
SoundSSGood
068a7d5d4a
crash fixed
2023-10-20 01:11:10 +03: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
Ivan Savenko
d295840c64
Merge pull request #3075 from josch/spelling
...
some spelling fixes
2023-10-19 11:15:25 +03:00
Johannes Schauer Marin Rodrigues
f9e1b302c7
some spelling fixes
2023-10-18 01:41:02 +02:00
Alexandre Detiste
15e45f966c
typos found by lintian
2023-10-17 22:06:08 +02:00
Laserlicht
2fcbf78e4e
unused var
2023-10-17 21:22:27 +02:00
Laserlicht
464c65a595
fix
2023-10-17 21:17:57 +02:00
Laserlicht
e05102192b
heroes and more buttons
2023-10-17 21:13:08 +02: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
1ffc246c8b
Merge pull request #3051 from Laserlicht/name_change
...
possibility to change name in lobby
2023-10-16 22:28:31 +02:00
Laserlicht
be6ed36422
fix
2023-10-16 21:35:29 +02:00
Laserlicht
ecd093cae4
fix
2023-10-16 21:28:44 +02:00
Laserlicht
0a1578b797
Apply suggestions from code review
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-10-16 21:24:59 +02:00
Laserlicht
d5b16ac96c
rename
2023-10-16 01:43:50 +02:00
Laserlicht
f3262a47c0
Update client/adventureMap/CList.cpp
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-10-16 01:42:01 +02:00
Laserlicht
f6843c0574
fix focus problem
2023-10-16 01:39:53 +02:00
Laserlicht
aeb559efb8
code review
2023-10-16 00:04:29 +02:00
Nordsoft91
ee997a291c
Merge pull request #3045 from Laserlicht/interface_improvement
...
various interface shortcuts
2023-10-15 23:48:22 +02:00
Ivan Savenko
dd841bdaa7
Use enum instead of mix of bool's and int's for tile reveal
2023-10-16 00:12:38 +03:00
Ivan Savenko
98fd939ed6
Cartographer/Observatory is now configurable object
2023-10-16 00:12:38 +03:00
Laserlicht
4528f42cdf
fix segmentation fault; update townlist on adventuremap
2023-10-15 15:53:19 +02:00
Laserlicht
3b853bff08
sort town feature
2023-10-15 14:31:33 +02:00