1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

11602 Commits

Author SHA1 Message Date
Ivan Savenko
9d7a6063b6
Merge pull request #2188 from Nordsoft91/fix_2187
Strict weak ordering on the data
2023-05-29 15:37:42 +03:00
DjWarmonger
c99aa74434
Merge pull request #2053 from vcmi/parellel_rmg
Okay, let's merge this.
2023-05-29 13:50:02 +02:00
Michael
eb618fbff9
rename function 2023-05-28 17:29:11 +02:00
Michael
8672fc7e3d
Allows to translate default playername 2023-05-28 16:57:24 +02:00
Michael
ee49487dc8
german translation 2023-05-28 15:29:42 +02:00
Michael
3ee7610015
added missing translation strings 2023-05-28 14:58:21 +02:00
nordsoft
0782ee7689 Strict weak ordering on the data 2023-05-28 00:12:03 +04:00
krs
6daa933aa2 Fixed errors and added a line after CreatureNumbersToggleGroup to separate them visually from next element. 2023-05-24 20:16:49 +03:00
krs
a7606010ee Moved creatureInfo into a group for easier calculations 2023-05-24 20:16:49 +03:00
Tomasz Zieliński
0e37c7b7d0 By deafult use multithreaded RMG 2023-05-24 18:16:04 +02:00
Tomasz Zieliński
cd9bd491e0 Add option for single-thread generation. Still doesn't guarantee excactly identical maps :? 2023-05-24 18:02:11 +02:00
SoundSSGood
1366825f08 final fixup 2023-05-24 16:10:06 +03:00
Ivan Savenko
5b392639b5
Merge pull request #2181 from IvanSavenko/fix_mod_repo_url
Use 1.3 repo on Android
2023-05-23 16:46:26 +03:00
Ivan Savenko
59232e827d Use 1.3 repo on Android 2023-05-23 15:28:45 +03:00
Ivan Savenko
2c3e8c3390
Merge pull request #2168 from IvanSavenko/gui_handler_event_handling_refactoring
Event handling refactoring
2023-05-23 15:08:10 +03:00
Tomasz Zieliński
edf47f5769 Fix StdInc.h 2023-05-21 07:26:36 +02:00
Warzyw647
af3c6abb5e Added zone guard strength "none" 2023-05-21 00:13:45 +02:00
Ivan Savenko
10fc6cecef
Merge pull request #2157 from IvanSavenko/interface_layouts
Update in-game settings window to recent changes
2023-05-20 19:25:34 +03:00
Ivan Savenko
d6619e2605
Merge pull request #2173 from Laserlicht/patch-1
case-insensitive cheats
2023-05-20 19:25:27 +03:00
Warzyw647
7afcc3b350 Merge branch 'rmg-split-enum-monster-strength' into rmg-no-monster-zone 2023-05-20 17:29:07 +02:00
Warzyw647
149ae9986c Merge branch 'rmg-refactor-enums' into rmg-no-monster-zone 2023-05-20 17:28:25 +02:00
Tomasz Zieliński
f3c795462f Remove comment which break the build 2023-05-20 17:08:44 +02:00
Warzyw647
031671056d Merge branch 'develop' into rmg-no-monster-zone 2023-05-20 16:58:49 +02:00
Tomasz Zieliński
4e927f644d Missing precompiled header 2023-05-20 15:41:03 +02:00
Tomasz Zieliński
b2b2798214 Use boost::thread instead of std::thread 2023-05-20 14:43:05 +02:00
Tomasz Zieliński
aa16f57b8a Remove unused variables 2023-05-20 14:28:18 +02:00
Tomasz Zieliński
a8b882e5bb Remove another pragma 2023-05-20 14:16:18 +02:00
Tomasz Zieliński
5ffbdb10ef Another build fix 2023-05-20 14:07:16 +02:00
Tomasz Zieliński
e25448e7cd Fix build on macos 2023-05-20 14:00:03 +02:00
Tomasz Zieliński
c7f4fe8243 Another compile fix. 2023-05-20 13:47:36 +02:00
Tomasz Zieliński
a1531b58db More fixes 2023-05-20 13:38:14 +02:00
Warzyw647
5363fd5db3 Changing other enums to enum classes and adding comments with reasons for why some enums stay as enum-in-namespace. 2023-05-20 13:29:55 +02:00
Tomasz Zieliński
ae97912b1e Fix warning 2023-05-20 13:23:27 +02:00
Tomasz Zieliński
91baa65c8c Remove no longer needed synchronization that also fails to compile. 2023-05-20 13:15:46 +02:00
Ivan Savenko
956ff22e64
Merge pull request #2163 from IvanSavenko/adventure_map_zoom
Adventure map zoom
2023-05-20 13:35:53 +03:00
Ivan Savenko
867c5355da Fix tower shooters animation updates 2023-05-20 13:11:52 +03:00
Tomasz Zieliński
219e897db0 Added missing files. 2023-05-20 12:02:30 +02:00
Tomasz Zieliński
67c0fbc240 Merge remote-tracking branch 'origin/develop' into parellel_rmg
# Conflicts:
#	lib/rmg/modificators/WaterProxy.cpp
2023-05-20 11:59:39 +02:00
Tomasz Zieliński
15b254fded Give every Zone its own RNG 2023-05-20 11:46:32 +02:00
Tomasz Zieliński
5da8c96214 Fix include paths 2023-05-20 11:45:08 +02:00
Tomasz Zieliński
ccaece9d71 Refactor mapController to use precalculated obstacle set. 2023-05-20 10:57:05 +02:00
Tomasz Zieliński
cf0515dcd3 Moved Modificators to separate folder 2023-05-20 10:17:37 +02:00
Tomasz Zieliński
5f99facd8f Optimization - don't add multiple copies of Modificators which only need one instance. 2023-05-20 09:58:08 +02:00
Tomasz Zieliński
71f882d5ba Refactored Functions.cpp, removed unused function. 2023-05-20 07:55:28 +02:00
Tomasz Zieliński
c27b8383e7 Cleanup 2023-05-20 07:23:00 +02:00
Tomasz Zieliński
02586214a1 Synchronize ConnectionPlacers 2023-05-20 07:06:27 +02:00
Michael
70bdec41a3
case-insensitive cheats 2023-05-20 01:14:06 +02:00
Ivan Savenko
6981848288 Better documentation & cleanup 2023-05-20 01:51:49 +03:00
Ivan Savenko
a4000f2fc8 Removed isActive(int) method since its usages were redundant or wrong 2023-05-20 01:51:49 +03:00
Ivan Savenko
c77f8482e3 Replaced event handling break system with key capturing 2023-05-20 01:51:49 +03:00