games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity
13,434 Commits 22 Branches 70 Tags
a1a5bc28c206d945f74dd354b483d1501dea32c2
Commit Graph

13434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d295840c64 Merge pull request #3075 from josch/spelling 
some spelling fixes
 2023-10-19 11:15:25 +03:00
Ivan Savenko
18a2eb34ab Merge pull request #3077 from h2oboi89/patch-1 
Fixed anchor links in Manual.md
 2023-10-18 23:56:25 +03:00
Waters
646c0db7f3 Fixed anchor links 
`Stack_Queue` was not working on GitHub for me.

`stack-queue` does.
 2023-10-18 16:27:25 -04:00
Ivan Savenko
f7718628dc Merge pull request #3074 from Nordsoft91/quests 
Fix warnings about empty kill target
 2023-10-18 12:34:44 +03:00
Ivan Savenko
0091e9ae42 Merge pull request #3071 from a-detiste/develop 
typos found by lintian
 2023-10-18 12:33:18 +03:00
Johannes Schauer Marin Rodrigues
f9e1b302c7 some spelling fixes 2023-10-18 01:41:02 +02:00
nordsoft
966ffe4377 Fix warnings about empty kill target 2023-10-18 00:13:32 +02:00
Alexandre Detiste
15e45f966c typos found by lintian 2023-10-17 22:06:08 +02:00
Ivan Savenko
a77f332411 Merge pull request #3053 from Alexander-Wilms/metainfo-discord 
Improve metainfo file
 2023-10-17 12:16:51 +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
f6843c0574 fix focus problem 2023-10-16 01:39:53 +02:00
Nordsoft91
02c1425939 Merge pull request #3046 from Nordsoft91/editor-improvements-1.4 
Add map editor zoom and objects lock functionality
 2023-10-16 01:22:18 +02:00
Nordsoft91
ee997a291c Merge pull request #3045 from Laserlicht/interface_improvement 
various interface shortcuts
 2023-10-15 23:48:22 +02:00
Nordsoft91
71b47bfb72 Merge pull request #3055 from Nordsoft91/revert-2959 
Revert "Merge pull request #2959 from Alexander-Wilms/faster-server-c…
 2023-10-15 22:18:20 +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
Ivan Savenko
e052a96637 Merge pull request #3054 from Alexander-Wilms/ci-cleanup 
Move JSON validation script to CI folder
 2023-10-15 12:48:03 +03:00
Laserlicht
78026f40eb name opens town itself 2023-10-15 00:41:17 +02:00
Laserlicht
f6071ed181 fix 2023-10-15 00:09:32 +02:00
Laserlicht
c96cc405ed town now updates 2023-10-14 23:41:12 +02:00
nordsoft
c8452355ce Revert "Merge pull request #2959 from Alexander-Wilms/faster-server-connection" 
This reverts commit 43636af2e4, reversing
changes made to aed2e360ba.

# Conflicts:
#	client/CServerHandler.cpp
 2023-10-14 22:52:24 +02:00
Nordsoft91
3906217ef5 Merge pull request #3049 from Warzyw647/fix-morale-chance-lookup 
Fixed morale and luck chance lookup.
 2023-10-14 21:39:57 +02:00
Nordsoft91
aa25ab6488 Merge pull request #3035 from Nordsoft91/quests 
Quests rework
 2023-10-14 21:38:15 +02:00
Alexander Wilms
5c0c317691 Move JSON validation script to CI folder 2023-10-14 14:22:50 +00:00
Alexander Wilms
a8ff11ad74 Remove redundant mention of GPL 2 or later from metainfo description 2023-10-14 14:16:50 +00:00
Alexander Wilms
01aa288b72 Link to Discord instead of Slack in metainfo 2023-10-14 14:07:05 +00: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
nordsoft
4ab203eaae Add more object search flexibility 2023-10-14 03:16:17 +02:00
nordsoft
788147a897 Add line and fill brushes 2023-10-14 02:58:13 +02:00
nordsoft
4651893b48 Fix hota quests 2023-10-14 00:15:15 +02:00
Laserlicht
785c6507a6 code review 2023-10-13 23:50:01 +02:00
Laserlicht
b89cdda718 Tavern also in infobox & haptics 2023-10-13 23:36:51 +02:00
nordsoft
5f52e6b35e Revert "Auxiliary commit to revert individual files from 2bf8cdc9f525099348439c700af0466955f01b30" 
This reverts commit d9952495391f7ac77dd32dcf33f487e146b3655b.
 2023-10-13 23:35:37 +02:00
Laserlicht
0c6b1ca3c8 possibility to change name 2023-10-13 23:04:35 +02:00
Warzyw647
8058efb3bd Fixed morale and luck chance lookup. 2023-10-13 20:43:15 +02:00
nordsoft
55900ceb66 Add portraits delegate 2023-10-13 20:15:29 +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
08832eeeb4 fix 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
nordsoft
2bf8cdc9f5 Hota-related bugs were fixed 2023-10-13 12:52:45 +02:00
nordsoft
051886c98e Add shurtcuts 2023-10-13 11:13:57 +02:00
nordsoft
d85c5189ba Add object lock and zoom functinoality 2023-10-13 11:07:17 +02:00
nordsoft
006def7690 ui improvements 2023-10-13 11:07:17 +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