games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity
14,753 Commits 19 Branches 62 Tags 112 MiB
54b44aa5e8
Commit Graph

14753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ivan Savenko
342e6daebd Fix copy-paste error 2024-02-05 21:07:50 +02:00
Ivan Savenko
a97d1d9377 Fix crash on broken ENCHANTED bonus 2024-02-05 21:07:01 +02:00
Alexander Wilms
0495c52cf4 Don't call ScreenHandler::onScreenResize() when the window has been (un)maximized to avoid creating a huge texture and crashing 2024-02-05 18:59:55 +01:00
Ivan Savenko
9e5e7d95c3 Workaround for broken save compatibility 2024-02-05 18:46:48 +02:00
Ivan Savenko
b160cf1598
Merge pull request #3579 from kdmcser/develop 
update Chinese translation
 2024-02-05 18:44:59 +02:00
Ivan Savenko
156f1d9311
Merge pull request #3589 from Laserlicht/queue_adjust 
adjustable queue size for embedded queue
 2024-02-05 18:44:45 +02:00
Andrii Danylchenko
ec5c44bb92
Merge pull request #3594 from vcmi/fix-3550 
#3550 - fix case when unit is in reachability map but only next turn
 2024-02-04 10:07:44 +02:00
DjWarmonger
c09d577a24
Merge pull request #3590 from vcmi/penrose_tiling 
Positive opionions, no issues found.
 2024-02-03 20:00:46 +01:00
Andrii Danylchenko
c66de29550 #3550 - fix case when unit is in reachability map but only next turn 2024-02-03 17:48:52 +02:00
DjWarmonger
cb841e2e02
Merge pull request #3592 from godric3/map-editor-fixes 
Map editor - fix submod list and mine resources
 2024-02-03 13:13:19 +01:00
godric3
ec735aa959 Fix mine resource and productivity on map load, also made them non editable 2024-02-03 11:30:09 +01:00
godric3
b2cd92d937 Fix initializing map editor mod settings with more than one level of submods 2024-02-03 10:36:47 +01:00
Tomasz Zieliński
e6f0afd586 Tweaking parameters, cleanup 2024-02-02 15:50:33 +01:00
Tomasz Zieliński
178f960533 First working version 2024-02-02 14:27:32 +01:00
Tomasz Zieliński
9f7c986621 First version that compiles successfully 2024-02-02 10:37:08 +01:00
Alexander Wilms
caa22ad9d8 Don't call recreateWindowAndScreenBuffers() in ScreenHandler::onScreenResize() to fix crash due to a huge texture being created 2024-02-02 08:52:59 +01:00
Ivan Savenko
58ee72f684
Merge pull request #3588 from IvanSavenko/fix_regressions 
Fix regressions
 2024-02-01 22:27:52 +02:00
Ivan Savenko
7247038458
Merge pull request #3574 from SoundSSGood/altar-fixes 
Artifacts altar related fixes
 2024-02-01 22:27:41 +02:00
Ivan Savenko
64347a46c9
Merge pull request #3585 from IvanSavenko/changelog_january 
Updated changelog
 2024-02-01 22:25:38 +02:00
Laserlicht
5e3f0e631c
possibility to show small queue outside 2024-02-01 21:17:08 +01:00
Laserlicht
25188aead8
change config name 2024-02-01 20:50:58 +01:00
Laserlicht
aa2fc4b88a
adjustable queue size for embedded queue 2024-02-01 20:38:38 +01:00
Ivan Savenko
dabb719c5f
Merge pull request #3586 from Alexander-Wilms/ci-badge 
Readme: Point CI badge to runs that were triggered by a push to the d…
 2024-02-01 18:48:08 +02:00
Ivan Savenko
b25d4d76a7 Fix Grail digging success message 2024-02-01 18:22:11 +02:00
Ivan Savenko
e66a982c96 Fix backpack availability check in Grail digging 2024-02-01 18:21:54 +02:00
DjWarmonger
ca3225325b
Merge pull request #3587 from vcmi/dydzio0614-patch-1 
Replace VCMI 1.4.4 download badge with 1.4.5
 2024-02-01 17:09:15 +01:00
Ivan Savenko
46fe6c1b09 Fixed crash on missing campaign audio files 2024-02-01 18:08:01 +02:00
Dydzio
5209e5ffa2
Replace VCMI 1.4.4 download badge with 1.4.5 2024-02-01 14:06:56 +01:00
Alexander Wilms
4197c82f43
Readme: Point CI badge to runs that were triggered by a push to the develop branch 2024-02-01 13:45:55 +01:00
SoundSSGood
a42b60feb9 suggested changes 2024-02-01 13:28:08 +02:00
Ivan Savenko
1860dcf97c Updated changelog to include recent changes 2024-02-01 11:43:59 +02:00
Ivan Savenko
facdc9f993
Merge pull request #3583 from Laserlicht/town_portal 
town portal dialog adjustments
 2024-02-01 11:30:51 +02:00
Ivan Savenko
f329bfbe71
Merge pull request #3582 from IvanSavenko/campaign_fixes 
Campaign fixes
 2024-02-01 11:30:38 +02:00
Laserlicht
9e7fbc3ca2
use localstate 2024-01-31 21:29:04 +01:00
Ivan Savenko
0949160fed
Merge pull request #3580 from Alexander-Wilms/run-ci-on-push-to-develop 
Run CI on every push to develop branch instead of on a schedule
 2024-01-31 22:18:02 +02:00
Ivan Savenko
626087ab14
Merge pull request #3561 from MnHebi/develop 
Try to improve VCAI building build order
 2024-01-31 21:48:36 +02:00