1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Commit Graph

11733 Commits

Author SHA1 Message Date
Ivan Savenko
97b3b2e147 Fix build 2023-06-03 00:48:32 +03:00
Ivan Savenko
8e8601f39d Fix build 2023-06-02 21:54:52 +03:00
Ivan Savenko
d6a357fd17 Split some map object files into smaller files. Reduced includes usage. 2023-06-02 21:47:37 +03:00
Ivan Savenko
8ea0ecaec1 show/showAll methods now use Canvas instead of SDL_Surface
- added compatibility method to Canvas to allow SDL_Surface access
- added drawBorder method to Canvas to replace CSDL_Ext method
- added drawColor method to Canvas to replace CSDL_Ext method
- minor changes to Tavern and Trade windows to adapt to new API
2023-06-02 16:42:18 +03:00
Ivan Savenko
b04b11b9d1
Merge pull request #2175 from IvanSavenko/map_format_mappings
HotA map format support  - object mapping
2023-06-01 22:06:18 +03:00
Ivan Savenko
2f9073e13a Fix assertion 2023-06-01 16:03:37 +03:00
Ivan Savenko
25a4caa364
Merge pull request #2200 from rilian-la-te/fix-obligatory
CGHeroInstance: always add obligatory skills
2023-06-01 12:12:20 +03:00
Ivan Savenko
fce5f9f907 Fix buildings loading 2023-05-31 23:18:39 +03:00
Ivan Savenko
3519fd8302 Added view patterns for hota terrains 2023-05-31 23:18:39 +03:00
Ivan Savenko
312b703a78 Fixed mapping of hota objects 2023-05-31 23:18:39 +03:00
Ivan Savenko
952708e865 Basic version of object templates mapping 2023-05-31 23:18:39 +03:00
Ivan Savenko
b3ca6c8cee Fixed detection of campaign format 2023-05-31 23:18:39 +03:00
Ivan Savenko
029322f8bb Removed old test map that requires wog 2023-05-31 23:18:39 +03:00
Ivan Savenko
e1c01ca636 Fix CI build 2023-05-31 23:18:39 +03:00
Ivan Savenko
acac42291e Remove excessive CMap.h includes 2023-05-31 23:18:38 +03:00
Ivan Savenko
62595cb039 Split massive CMap.h a bit 2023-05-31 23:01:57 +03:00
Ivan Savenko
bf720200f9 Implemented identifiers remapping for game entities 2023-05-31 23:01:57 +03:00
Ivan Savenko
c51e0ef052 Added information on Heroes Chronicles map ID's 2023-05-31 23:01:57 +03:00
Ivan Savenko
8d0dcd6ad7 All h3m bitsets are now loaded inside mapReader 2023-05-31 23:01:57 +03:00
Ivan Savenko
5fe5d0c045 Fix loading of buildings of random town 2023-05-31 23:01:57 +03:00
Ivan Savenko
ffd7144df8 Implemented identifiers mapping for town buildings 2023-05-31 23:01:57 +03:00
Ivan Savenko
de769a04d6 Remove unnecessary includes from headers 2023-05-31 23:01:57 +03:00
Ivan Savenko
927fcc7d45 Removed hota objects desription, will be added to hota mod instead 2023-05-31 23:01:57 +03:00
Ivan Savenko
daaaf84392 Icon index for map format is now defined in config 2023-05-31 23:01:57 +03:00
Ivan Savenko
fb55719671 Map format support status can now be loaded from gameSettings 2023-05-31 23:01:57 +03:00
Ivan Savenko
402823e3d5 Fix loading of some user-made maps 2023-05-31 23:01:57 +03:00
Warzyw647
bc4755a89a Merge branch 'develop' into rmg-split-enum-monster-strength 2023-05-31 19:53:19 +02:00
Konstantin
e82acf4840 CGHeroInstance: always add obligatory skills
Fixes #2198
2023-05-31 20:03:59 +03:00
Ivan Savenko
3a102989f0
Merge pull request #2195 from Laserlicht/patch-3
Added translation strings & update german
2023-05-31 11:45:47 +03:00
Warzyw647
4c513e8bb0 Water zones get monster strength ZONE_NONE during their creation instead of a hardcoded check for zone type WATER at guard creation time.
Also preliminary preparations for water zone customization in the template json.
2023-05-31 00:24:52 +02:00
Ivan Savenko
eff6551f80
Merge pull request #2171 from krs0/feature/schema_updates
Rearranging Schemas
2023-05-29 15:37:50 +03:00
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