games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity
15,487 Commits 21 Branches 61 Tags 104 MiB
7543e26d42
Commit Graph

441 Commits

Author SHA1 Message Date
Ivan Savenko
b4a1a755a4
Merge pull request #3498 from IvanSavenko/simturns_pathfinder 
[1.4.3] Fixes for simultaneous turns
 2024-01-15 12:00:54 +02:00
Laserlicht
e25c8c21e0
fix buggy multiplayer selection 2024-01-13 21:51:56 +01:00
Ivan Savenko
fc163898d9 Fixed delayed updates in timer editing, limited to 24 hours at most 2024-01-13 22:31:26 +02:00
Ivan Savenko
7cf738b20e
Merge pull request #3462 from Laserlicht/trim_text 
limit textboxes
 2024-01-12 21:53:30 +02:00
Alexander Wilms
f3277b7953 Define each identifier in a dedicated statement 2024-01-10 00:22:23 +00:00
Ivan Savenko
eae3d806db
Merge pull request #3460 from Laserlicht/changedate_sort 
add sort for changedate
 2024-01-09 12:43:01 +02:00
Laserlicht
056dccda30
different max width 2024-01-08 00:08:05 +01:00
Laserlicht
24d4816a36
trim text 2024-01-07 23:42:48 +01:00
Laserlicht
8b262e49a6
add sort for changedate 2024-01-07 20:17:44 +01:00
Laserlicht
8f2f5344a9
correct starting bonus in selection windows 2024-01-07 17:25:33 +01:00
Ivan Savenko
63a2ed7cf8 Replace vector[] with range-checking vector.at() 2024-01-04 23:52:57 +02:00
Laserlicht
cb9c4bbaf0 unlimited replay option 2023-12-28 20:48:19 +01:00
Laserlicht
a3e27b859e extra option tab 2023-12-28 19:41:01 +01:00
Laserlicht
c471b626a2
code review 2023-12-27 15:26:08 +01:00
Laserlicht
fc4827c89c
option for allowing cheats 2023-12-27 14:39:35 +01:00
Ivan Savenko
50536e28da Fixed invalid text ID in description of "start with hero" campaign bonus 2023-12-23 18:13:31 +02:00
Ivan Savenko
ec1aee68d5 Fix invisible chat in pregame. Fixed positioning of chat box 2023-12-23 18:12:55 +02:00
Ivan Savenko
37a8c8db8d Workaround for vcmi-extras bug 2023-12-22 18:40:29 +02:00
Ivan Savenko
fe5918ebf5 Clients will now switch to turn options when host does so 2023-12-22 18:40:28 +02:00
Ivan Savenko
76cb5387c5 Access CHero in a way that will throw exception on invalid access 
instead of crash
 2023-12-13 16:50:56 +02:00
Ivan Savenko
edbe25b33a Updated layout and localizations 2023-12-07 16:36:44 +02:00
Ivan Savenko
861c53059e Added callbacks for preset dropdowns 2023-12-07 13:57:16 +02:00
Ivan Savenko
653304b004 Implemented accumulating timers, rename creature timer to unit timer 2023-12-07 13:57:16 +02:00
Ivan Savenko
02f7193260 Fix regression from map translation - properly translate custom main 
hero name
 2023-11-27 20:27:10 +02:00
Ivan Savenko
e5e01ab35d Disable spectator mode in single player to avoid confusing players 2023-11-20 14:38:57 +02:00
Ivan Savenko
13763cad8e Remove few more implicit conversions 2023-11-15 15:55:19 +02:00
Ivan Savenko
0842f5afee Removed remaining usages of std::vector<bool> 2023-11-15 15:55:18 +02:00
Ivan Savenko
f65f4b1285 Disable new UI if enhancements are off 2023-11-13 19:49:41 +02:00
Ivan Savenko
d1ae5bbee5 Implement AI simturns checkbox 2023-11-13 19:06:56 +02:00
Ivan Savenko
c5eeaa6526 Added non-linear slider for better simturn duration selection 2023-11-13 19:06:56 +02:00
Ivan Savenko
7d54f6a9c0 Implemented basic support for plural forms in translations 2023-11-13 19:06:56 +02:00
Ivan Savenko
e160b8557b Implement min/max simturns callbacks 2023-11-13 19:06:56 +02:00
Ivan Savenko
32633d5f52 Initial version of Turn Options tab screen 2023-11-13 19:06:56 +02:00
Ivan Savenko
3268ebe27c Moved some code from OptionTab to separate class, OptionTabBase 2023-11-13 19:06:56 +02:00
Ivan Savenko
59806bf112 Fix right-click tooltips for starting hero/towns 2023-11-12 17:17:07 +02:00
Ivan Savenko
86a3806bec MetaString refactor to eliminate integer usage for identifiers 
- entity names are now stored and serialized as text ID's
- added helper methods for convenience to get entities names to
metastring
 2023-11-07 22:47:10 +02:00
Tomasz Zieliński
c909bd766e Merge remote-tracking branch 'origin/develop' into fix_rmg_teams 
# Conflicts:
#	lib/rmg/CMapGenOptions.cpp
#	lib/rmg/CMapGenOptions.h
 2023-11-07 20:54:04 +01:00
Andrii Danylchenko
0927d3e3e8
Merge pull request #3145 from vcmi/fix-3142 
#3142 - fi custom campaign selection screen
 2023-11-05 11:12:58 +02:00
Andrii Danylchenko
d50ebd7d58 #3142 - fi custom campaign selection screen 2023-11-04 14:34:18 +02:00
Ivan Savenko
8d5fa41a19 Minor fixes 2023-11-03 16:03:29 +02:00
Ivan Savenko
10e50548e7 Converted Component class to use VariantIdentifier instead of int 2023-11-02 12:00:04 +02:00
Tomasz Zieliński
6e7b68d0e6 Unused variable, unused code 2023-10-30 21:33:49 +01:00
Tomasz Zieliński
e105b23a37 Merge remote-tracking branch 'origin/develop' into fix_rmg_teams 
# Conflicts:
#	Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON
#	Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON
#	client/lobby/RandomMapTab.cpp
 2023-10-30 20:08:13 +01:00
Tomasz Zieliński
f39edf9413 Update ally and enemy flags when selecting new template 2023-10-30 07:48:51 +01:00
Tomasz Zieliński
4f2cde018c Fixed most of reported issues, removed unused code. 2023-10-29 21:25:39 +01:00
Ivan Savenko
0169c65937
Merge pull request #3100 from IvanSavenko/split_net_packs 
Split netpacks.h into multiple files
 2023-10-29 13:46:40 +02:00
Tomasz Zieliński
368a185008 Cleaning up the code 2023-10-29 10:05:24 +01:00
Tomasz Zieliński
07dac8b6d4 Works more or less 2023-10-28 20:30:38 +02:00
Nordsoft91
8f2b50a5e2
Merge pull request #3095 from Laserlicht/team_alignment 
fix team alignments
 2023-10-26 23:19:18 +02:00
Tomasz Zieliński
a817e481d0 Merge fix 2023-10-26 10:46:04 +02:00
Tomasz Zieliński
36911d1e0a Merge remote-tracking branch 'origin/develop' into fix_rmg_teams 
# Conflicts:
#	client/lobby/RandomMapTab.cpp
 2023-10-26 10:31:41 +02:00
Laserlicht
e28d14d16d
not needed anymore 2023-10-24 18:56:30 +02:00
Laserlicht
abb279f5b4
use config 2023-10-24 18:51:58 +02: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
a70ad7202f
Merge pull request #3088 from Laserlicht/non_squared 
Minimap keep aspect ratio (Letterboxing)
 2023-10-22 16:55:58 +03:00
Laserlicht
b67548e7cf
format 2023-10-22 15:06:12 +02:00
Laserlicht
7b370d1967
fix team alignments 2023-10-22 15:00:04 +02:00
Ivan Savenko
8752551786
Merge pull request #3086 from Laserlicht/show_random 
show random maps
 2023-10-22 12:29:31 +03: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
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
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
b2396a61fa
code review 2023-10-14 13:34:39 +02:00
Laserlicht
7217992898
code review 2023-10-14 12:08:38 +02:00
Laserlicht
0c6b1ca3c8
possibility to change name 2023-10-13 23:04:35 +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
56d5c74a61
Merge pull request #2996 from Nordsoft91/fix-2992 
Capture key event in chat box
 2023-10-04 19:59:06 +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
Laserlicht
ec8580b99e
Merge branch 'develop' into patch-4map_overview_rework 2023-10-02 21:03:16 +02:00
nordsoft
213d0c3553 Capture events in chat box 2023-10-01 16:40:26 +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
6da605ff83 Campaign meta strings 2023-09-28 00:10:28 +02:00
nordsoft
5b97c323d3 Rename hero strings to text id 2023-09-28 00:04:05 +02:00
nordsoft
03c099d4fd First steps 2023-09-27 22:53:13 +02:00
Ivan Savenko
94dbde05a0
Merge pull request #2868 from IvanSavenko/simultaneous_turns 
Simultaneous turns
 2023-09-27 15:45:02 +03:00
Nordsoft91
c803b57c33
Merge pull request #2889 from Nordsoft91/mod-compatibility-check 
Proper mod compatibility check logic
 2023-09-26 19:29:46 +02:00
Ivan Savenko
54adeef29f Added temporary UI for simturns testing 2023-09-26 13:42:20 +03:00
Ivan Savenko
5b21a5ffbc Simturn duration is now part of StartInfo 2023-09-26 13:42:20 +03:00
nordsoft
dce1ac1538 Redesign mod incompatibility message 2023-09-23 00:32:48 +02:00
Ivan Savenko
00db2e245f
Merge pull request #2872 from Laserlicht/bonus_selection 
fix bonus selection
 2023-09-20 13:19:54 +03:00
Laserlicht
babf858112
format 2023-09-19 01:50:42 +02:00
Laserlicht
4ac3e3c2e5
fix bonus selection 2023-09-19 01:48:26 +02:00
Laserlicht
ff96b1af0a
initial hero overview 2023-09-17 00:32:10 +02:00
Ivan Savenko
f8541d0ae4 Merge branch 'vcmi/master' into 'vcmi/develop' 2023-09-15 13:59:02 +03:00
Laserlicht
9cf274362e
small folder optimation 2023-09-12 20:28:54 +02:00
Ivan Savenko
538665fe42 Fix "Start game" blocking status: 
- Start game is now initially blocked
- Receiving valid startInfo from server will unlock button
 2023-09-12 21:15:15 +03:00
Ivan Savenko
f39fbe5151
Merge pull request #2757 from IvanSavenko/filesystem_refactor 
Filesystem refactor - part 1
 2023-09-07 10:51:02 +03:00
Michael
287c0daaff add also savegame 2023-09-06 12:34:31 +03:00
Michael
36ab973dc8 fix difficulty widget 2023-09-06 12:34:23 +03:00
Ivan Savenko
86a7f5f5cd Removed getStr(bool), replaced with similar toString() 2023-09-04 22:21:02 +03:00
Ivan Savenko
1d0e696db6 Added RenderHandler that acts as factory for images and animations 2023-09-04 18:22:34 +03:00
Ivan Savenko
8dfdfffd87 Use ResourcePath for audio files 2023-09-04 18:22:34 +03:00