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
14,956 Commits 21 Branches 61 Tags 104 MiB
acceca0139
Commit Graph

14956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Savenko
c577ea3e8d Fix potentially uninitialized values 2024-02-12 12:31:27 +02:00
Alexander Wilms
95b35a1063 CI: Accept JSON with comments, but not JSON5 in its entirety 2024-02-12 00:49:57 +01:00
Alexander Wilms
1fa3447ee7 CI: Fix Ccache for branches other than develop in forks of vcmi/vcmi 2024-02-12 00:49:45 +01:00
Ivan Savenko
eba4347cbb Code cleanup 2024-02-11 21:54:30 +02:00
Ivan Savenko
a909d7ddde Removed cmake_modules/VCMI_lib macro, use it directly in place 2024-02-11 20:38:24 +02:00
Ivan Savenko
30d677724b Remove no longer used methods from Java wrapper 2024-02-11 20:16:44 +02:00
Ivan Savenko
19ccef7131 Fix build 2024-02-11 19:54:30 +02:00
Ivan Savenko
cded8b1999 Show human-readable thread name in log 2024-02-11 17:55:02 +02:00
Ivan Savenko
0fc0ad238b Fixes for server shutdown logic, implemented connection aborting for 
local server
 2024-02-11 17:55:02 +02:00
Ivan Savenko
bb10f5a055 Fix building with static libs enabled on gcc 2024-02-11 17:55:02 +02:00
Ivan Savenko
f08c9f4d59 Renamed ENABLE_STATIC_AI_LIBS option to match its actual effect 2024-02-11 17:55:02 +02:00
Ivan Savenko
0d263c5571 Implemented option to run server as a thread with shared VLC 2024-02-11 17:55:02 +02:00
Ivan Savenko
c2286e5126 Server now consists from library and separate executable projects 2024-02-11 17:55:02 +02:00
Ivan Savenko
dc8d48a3b6
Merge pull request #3593 from vcmi/random_template_description 
Add random map description and display it in RMG menu
 2024-02-11 17:54:27 +02:00
Ivan Savenko
ef8eb330d6
Merge branch 'develop' into random_template_description 2024-02-11 17:54:18 +02:00
Ivan Savenko
f1a8e78f0b
Merge pull request #3596 from vcmi/fixes_for_water 
Fixes for RMG water
 2024-02-11 17:53:46 +02:00
Ivan Savenko
3411a70f8e
Merge pull request #3477 from IvanSavenko/lobby 
[1.5] Networking rework and in-game lobby
 2024-02-11 17:53:29 +02:00
Ivan Savenko
7790acae3a Fix save compatiblity with 1.4 2024-02-11 17:31:30 +02:00
Ivan Savenko
38ba42ef7a Rename 'c' to 'logicConnection' 2024-02-11 16:26:27 +02:00
Ivan Savenko
f2ecd4cf11 Merge branch 'develop' into 'lobby' 2024-02-11 16:13:13 +02:00
Ivan Savenko
51f24178a3
Merge pull request #3603 from macomarivas/develop 
Updated spanish.json translation
 2024-02-11 12:28:01 +02:00
Ivan Savenko
1447f03aa3
Merge pull request #3598 from tytannial/develop 
Update Chinese translation
 2024-02-11 12:27:51 +02:00
Ivan Savenko
a3462acac3
Merge pull request #3602 from Laserlicht/campaignExtraButton 
Campaign extra options button
 2024-02-11 12:27:14 +02:00
Ivan Savenko
ad602573ff
Merge pull request #3600 from dydzio0614/sod-fly 
Fix SoD fly mechanics
 2024-02-11 12:26:20 +02:00
Ivan Savenko
97e9f5a826
Merge pull request #3607 from Alexander-Wilms/redundant-virtual-specifier 
Remove redundant `virtual` specifiers
 2024-02-11 12:25:11 +02:00
Alexander Wilms
54b44aa5e8 Re-add virtual that was accidentally removed 2024-02-10 20:46:23 +01:00
Alexander Wilms
522cb571b3 Remove redundant virtual specifiers 
`grep -nr virtual | grep -v googletest | grep override > ../redundant_virtual.txt`

```python
import os

with open("../redundant_virtual.txt") as f:
    for line in f:
        print()
        line: str = line.strip()
        print(line)
        tmp = line.split(":")
        file = tmp[0].strip()
        code = tmp[-1].strip()
        print(file)
        print(code)
        new_code = code.replace("virtual ", "", 1)
        # https://superuser.com/a/802490/578501
        command = f"export FIND='{code}' && export REPLACE='{new_code}' && ruby -p -i -e \"gsub(ENV['FIND'], ENV['REPLACE'])\" {file}"
        os.system(command)
```
 2024-02-10 20:46:13 +01:00
Ivan Savenko
1a144fc516 Some progress on private rooms support 2024-02-10 19:02:25 +02:00
Ivan Savenko
4a0dd2da2c Added option to create new account even if player already have one 2024-02-09 23:02:41 +02:00
Alexander Wilms
a7c29e2a95 CI: Only use json5 Python package for validation 
This simplifies the script and makes the output more readable
 2024-02-08 21:13:20 +01:00
Asirome
51756f9889
Updated spanish.json translation 2024-02-08 10:45:24 +01:00
Laserlicht
4e8152f268 reorder gui 2024-02-07 22:04:50 +01:00
Laserlicht
c8b6d6a684 add extra button for campaigns 2024-02-07 21:40:56 +01:00
Dydzio
fd9810adf4 Working SoD version of fly 2024-02-07 19:27:02 +01:00
Tytannial
a6cfacc7e3 Update Chinese Launcher translation 2024-02-07 09:01:55 +08:00
Tytannial
23e1b38c4f Update Chinese translation 2024-02-07 08:50:40 +08:00
Ivan Savenko
b319d16de6
Merge pull request #3597 from IvanSavenko/bugfixing 
Fixes for map/save loading
 2024-02-07 00:16:43 +02:00
Ivan Savenko
c068c92c92
Merge pull request #3201 from Alexander-Wilms/fix-huge-texture-crash 
Fix broken intro and crash when resizing window
 2024-02-07 00:16:15 +02:00
Ivan Savenko
4130d5bad1
Merge pull request #3591 from Alexander-Wilms/gitignore 
Add more patterns to .gitignore
 2024-02-07 00:15:45 +02:00
Ivan Savenko
18f9d29fd2 Fix typo 2024-02-07 00:15:20 +02:00
Ivan Savenko
9730b24214 Fix typo 2024-02-06 16:36:57 +02:00
Ivan Savenko
77f177adc7 Track last login time for accounts 2024-02-06 16:28:35 +02:00
Ivan Savenko
fd17133da3 Fix editor build 2024-02-06 00:40:26 +02:00
Alexander Wilms
efb021333b Building_Linux.md: Use cmake -S ../vcmi instead of cmake ../vcmi 2024-02-05 22:32:45 +01:00
Alexander Wilms
a2bd3f5b46 Add more patterns to .gitignore 
These were needed for files created by
`cmake ../vcmi && cmake --build .`
 2024-02-05 22:32:41 +01:00
Ivan Savenko
1cecaf2bf5 Skip unresolved identifier from list of allowed heroes/artifacts in vmap 2024-02-05 22:26:53 +02:00
Ivan Savenko
a18f9d1e8d Added workaround for references to old 'torosar ' ID 2024-02-05 21:56:06 +02:00
Ivan Savenko
9e09fe08e1 Fixed duplicated hero check - was used too early, before hero type is 
loaded
 2024-02-05 21:55:48 +02:00
Ivan Savenko
87059be67b Added range checks to values read from h3m. 
Fixes reading of morale/luck values (-3..3) as unsigned leading to
overflow.
 2024-02-05 21:27:55 +02:00
Ivan Savenko
4af4d1a75e Remove excessive logging 2024-02-05 21:11:00 +02:00