1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-18 17:40:48 +02:00
Commit Graph

8809 Commits

Author SHA1 Message Date
SoundSSGood
30db38c0fe Unified CGameHandler::bulkMoveArtifacts and CGameHandler::bulkSwapArtifacts to one 2022-11-10 20:11:26 +02:00
SoundSSGood
ad47a7573c Code style. Typo. Code clean up. 2022-11-10 18:29:39 +02:00
SoundSSGood
b9087e2d63
Apply suggestions from code review
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-11-10 17:45:54 +02:00
SoundSSGood
f2afd9e831
Update server/CGameHandler.cpp
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-11-10 17:37:50 +02:00
nordsoft
9397c836f2 Enable scrolling for buttons 2022-11-10 19:15:18 +04:00
Andrii Danylchenko
c5cf0e4086
Merge pull request #1103 from Nordsoft91/autobattle-bugfix
Preventing multiple AI from being created
2022-11-10 15:18:24 +02:00
nordsoft
8871c7abbd Attempt to fix ios build 2022-11-10 16:02:11 +04:00
nordsoft
6406157038 Attempt to fix ios build 2022-11-10 14:53:12 +04:00
nordsoft
0ad06af593 Attempt to fix ios build 2022-11-10 14:08:19 +04:00
Andrii Danylchenko
1ca2283a90
Merge pull request #1105 from krs0/feature/#1071__In_latest_night_builds_there_are_problems_with_schema_obstacle.json_and_file_obstacles.json
Problems with schema obstacle.json and file obstacles.json #1071
2022-11-10 11:53:08 +02:00
Andrii Danylchenko
5f92a0760f
Merge pull request #1113 from vcmi/nk-fix-hung
NKAI: a few crash/hang fixes
2022-11-10 11:48:17 +02:00
Andrii Danylchenko
5222ea8c25
Merge pull request #1110 from Nordsoft91/whereshouldbeattached
#1754 Fix crash with objects belonging players without state
2022-11-10 11:43:50 +02:00
Andrii Danylchenko
502ad59169
Merge pull request #1117 from vcmi/readme-patch
Add downloads badge
2022-11-10 11:42:22 +02:00
nordsoft
b3aa87fe10 Attemp to fix ios build 2022-11-10 12:48:17 +04:00
nordsoft
16ab5f9e02 Revert "Attempt to fix ios build"
This reverts commit eab8abef67.
2022-11-10 05:14:19 +04:00
nordsoft
eab8abef67 Attempt to fix ios build 2022-11-10 04:27:26 +04:00
nordsoft
81a0ac2398 Lobby refactoring and changes 2022-11-10 04:20:44 +04:00
nordsoft
ab630d43f1 Implement proper logging 2022-11-10 02:44:34 +04:00
nordsoft
0a522ccb21 Hadle disconnection properly 2022-11-10 02:30:51 +04:00
nordsoft
45129c5cda Update proxy server 2022-11-09 20:25:06 +04:00
nordsoft
f83e4f4ce4 Add lobby icon 2022-11-09 00:21:26 +04:00
nordsoft
43ca275afa Fix ios typo 2022-11-09 00:03:15 +04:00
nordsoft
e83870205e Global veriables 2022-11-08 20:47:01 +04:00
Nordsoft91
e5809ac9f7
Add downloads badge 2022-11-08 18:31:09 +04:00
nordsoft
9ffc50457a Bypass command line args to vcmiserver 2022-11-08 18:05:47 +04:00
nordsoft
57dfeb2ff2 Remove excessive code 2022-11-08 05:03:33 +04:00
nordsoft
17d8c646f2 Command line arguments for ios 2022-11-08 05:02:26 +04:00
nordsoft
97e5fc8a07 Lobby works 2022-11-08 04:44:34 +04:00
SoundSSGood
ff63167553
warnings fixed 2022-11-07 18:31:22 +02:00
SoundSSGood
3a3b559a0b attempt to fix the build 2022-11-07 14:20:28 +02:00
SoundSSGood
203c54e956 BulkMoveArtifacts structure optimization 2022-11-07 14:13:36 +02:00
Andrii Danylchenko
55914290ca
Merge pull request #1109 from trofi/fix-format-string
mapeditor/mainwindow.cpp: use '%s' (not '%b') for string formatter
2022-11-07 14:06:56 +02:00
Andrii Danylchenko
233b850daf NKAI: a few crash/hang fixes 2022-11-07 13:58:20 +02:00
nordsoft
7b6d9c23b3 Attempt to pass lobby parameters as command line arguments 2022-11-07 13:44:58 +04:00
SoundSSGood
0032947735 regression fixed. Artifact assemble dialog shows multiple times. 2022-11-07 00:36:13 +02:00
SoundSSGood
a35db9a696 server blocksPack upd 2022-11-07 00:19:43 +02:00
SoundSSGood
f72a3e3884 function ArtifactUtils::checkSpellbookIsNeeded for the artifacts like a Titan's thunder 2022-11-07 00:18:05 +02:00
nordsoft
9486373906 Fix issue with server 2022-11-07 02:09:05 +04:00
SoundSSGood
0f391e19d5 server side funcs 2022-11-06 23:59:30 +02:00
SoundSSGood
95ab343116 Net Packs BulkMoveArtifacts structure and BulkMoveArtifacts::applyCl 2022-11-06 23:54:50 +02:00
SoundSSGood
d0895e30ef callback functions and cleaning up unused code 2022-11-06 23:41:29 +02:00
SoundSSGood
363e461c3e ArtifactUtils and CArtifactFittingSet class 2022-11-06 23:29:22 +02:00
nordsoft
0eb74b85c9 Merge remote-tracking branch 'upstream/develop' into lobby 2022-11-07 00:23:20 +04:00
nordsoft
0f35082024 Fix crash with objects belonging players without state 2022-11-06 03:26:13 +04:00
Sergei Trofimovich
560c528ec8 mapeditor/mainwindow.cpp: use '%s' (not '%b') for string formatter
mapeditor/mainwindow.cpp: In member function
      'void MainWindow::onSelectionMade(int, bool)':
    mapeditor/mainwindow.cpp:1014:47:
      warning: format '%b' expects argument of type 'unsigned int',
      but argument 3 has type 'const char*' [-Wformat=]
     1014 |                 auto info = QString::asprintf(
         "Selection on layer %d: %b", level, anythingSelected ? "true" : "false");
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         |                                                    |
         |                                                    const char*
2022-11-05 20:25:51 +00:00
nordsoft
dffd7c0f24 Fix crash related to V hotkey during AI turn 2022-11-04 18:29:45 +04:00
krs
aab394ff93 #1071 - In latest night builds there are problems with schema obstacle.json and file obstacles.json 2022-11-04 00:06:15 +02:00
nordsoft
6995911d6e Preventing multiple AI from being created 2022-11-03 22:01:20 +04:00
Andrii Danylchenko
ae1d2c50e2
Merge pull request #1099 from kambala-decapitator/disable-tests
disable tests by default
2022-11-03 14:01:25 +02:00
Andrey Filipenkov
c20ae90973 disable tests by default 2022-11-03 11:33:17 +03:00