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

9856 Commits

Author SHA1 Message Date
DjWarmonger
908f8f5aee Update README.md 2023-02-05 10:06:35 +02:00
DjWarmonger
ca01c179b4
Merge pull request #1528 from rilian-la-te/daremyth-fix-bonus-v2
vcmi: deprecate MAXED_SPELL
2023-02-04 15:08:59 +01:00
Konstantin
7b8aebe4e3 vcmi: deprecate MAXED_SPELL
It is almost identical to SPECIAL_FIXED_VALUE_ENCHANT.

Replace its usage in JSON and inside deprecated converter
to SPECIAL_FIXED_VALUE_ENCHANT. Remove buggy string inside
getEffectLevel.
2023-02-04 16:23:03 +03:00
Ivan Savenko
00c1a4ef76
Merge pull request #1543 from IvanSavenko/changelog-1.2
Add current version of 1.2 changelog
2023-02-03 14:55:59 +02:00
Ivan Savenko
4ecd1c68bf Updated changelog 2023-02-03 13:30:19 +02:00
Ivan Savenko
63edc2efb9 Added changelog entries for rest of commits 2023-02-03 13:29:35 +02:00
Ivan Savenko
d3139f62ab Initial commit for 1.2 changelog 2023-02-03 13:29:33 +02:00
Ivan Savenko
9c59025db0 Merge master -> develop 2023-02-03 13:26:44 +02:00
Ivan Savenko
4cb71e476e
Merge pull request #1544 from IvanSavenko/sdl_remove_event_access
Reduce access to SDL events outside of GUI Handler
2023-02-03 12:48:05 +02:00
Ivan Savenko
ae9f040abf removed unused method 2023-02-03 11:42:27 +02:00
Ivan Savenko
9833edcf73 Removed using namespace SDL_Ext 2023-02-03 11:39:40 +02:00
Ivan Savenko
d87fb43dcd Replaced SDL access with VCMI methods 2023-02-03 11:39:40 +02:00
Ivan Savenko
3fef2a5e1f Moved Colors to a separate file, updated includes 2023-02-03 11:39:40 +02:00
Ivan Savenko
aab082fd2e Remove remaining access to SDL_Events 2023-02-03 11:39:40 +02:00
Ivan Savenko
594b7614cf Fix CI build 2023-02-03 11:39:40 +02:00
Ivan Savenko
cfcaf5cbb6 renamed keyDown -> keyPressed 2023-02-03 11:39:40 +02:00
Ivan Savenko
b1821d4442 Removed some SDL access from non-SDL code 2023-02-03 11:39:40 +02:00
Ivan Savenko
e1bd0d2a04 API for custom events no longer requires SDL access 2023-02-03 11:39:40 +02:00
Ivan Savenko
d4fba3787c Removed usage of SDL_KeyboardEvent from UI code 2023-02-03 11:39:40 +02:00
Ivan Savenko
860fe43131 Merged two mouse button enums 2023-02-03 11:39:40 +02:00
Ivan Savenko
6669ffd4b3 Moved input-related code from SDL_Extensions to GuiHandler 2023-02-03 11:39:40 +02:00
Ivan Savenko
214fc19e74 CIntObject now receives mouse position as point instead of SDL event 2023-02-03 11:39:39 +02:00
Ivan Savenko
58cfddccaa
Merge pull request #1546 from rilian-la-te/dead-code-removal
Remove SDL usage from VCMI library
2023-02-03 11:28:29 +02:00
Ivan Savenko
64faa13b6d
Merge pull request #1487 from IvanSavenko/battle_actions_refactoring
Battle actions refactoring
2023-02-03 11:28:14 +02:00
Ivan Savenko
b429f0bfeb Change version to 1.1.1 2023-02-03 11:25:08 +02:00
Ivan Savenko
9c13ac8eb0
Merge pull request #1542 from vcmi/beta
Release 1.1.1
2023-02-03 01:00:18 +02:00
Konstantin
4feab69867 mapeditor: use vcmi_endian.h
There is no need to redefine this functions, let's use shared
implementation
2023-02-03 00:39:44 +03:00
Konstantin
88ef83db53 client: remove SDL_BYTEORDER usage
Make use of CMake endian checking in this places too.
2023-02-03 00:37:37 +03:00
Konstantin
cffdabf48e lib: replace SDL usage to Boost one
It is safer and header-only, and can be removed after C++23 is accepted.
There is no need for SDL in non-GUI.
2023-02-02 23:58:22 +03:00
Konstantin
70786f4963 lib: remove unused header
This an unused header with empty class. Just remove it.
2023-02-02 23:50:50 +03:00
Ivan Savenko
a5f51b21c4
Merge pull request #1499 from dydzio0614/battle-queue-improvement
Battle queue improvement
2023-02-02 21:55:49 +02:00
Dydzio
2ef33d54ab Merge branch 'develop' into battle-queue-improvement 2023-02-02 18:26:31 +01:00
Ivan Savenko
2ac997d8a9 Fix "holding" animation speed 2023-02-02 14:37:34 +02:00
Ivan Savenko
731f7b0578 Fix opening spellbook via clicking on hero 2023-02-02 14:37:16 +02:00
Ivan Savenko
1e09c39c0e Fix battle cursor after attack command 2023-02-02 14:36:58 +02:00
Ivan Savenko
3c8a0b9e70 Add missing text 2023-02-02 13:43:20 +02:00
Ivan Savenko
9678296875 Hero interaction is now battle action 2023-02-02 13:43:19 +02:00
Ivan Savenko
d3c85a19cb Merged CClickableHex class into BattleFieldController 2023-02-02 13:35:57 +02:00
Ivan Savenko
c3b79c786b Spellcasters UI now shares handling with hero spellcasting 2023-02-02 13:25:55 +02:00
Ivan Savenko
dbbbba5f2d Fix typo 2023-02-02 13:25:55 +02:00
Ivan Savenko
f150ced14c All spellcasters should work correctly now 2023-02-02 13:25:55 +02:00
Ivan Savenko
55a58596bc Mostly finished refactoring of BattleActionsController
TODO: test actions
TODO: test casters
TODO: fix random casters
2023-02-02 13:25:55 +02:00
Ivan Savenko
a2035122e1 Removed makingTurn variable 2023-02-02 13:25:55 +02:00
Ivan Savenko
b1c67fbf47 Better formatting for enum 2023-02-02 13:25:55 +02:00
Ivan Savenko
4d62bf22f2 Removed no longer used code 2023-02-02 13:25:55 +02:00
Ivan Savenko
f1ea88ae9a
Merge pull request #1505 from dydzio0614/cheats-improvements
Cheats improvements
2023-02-02 12:21:19 +02:00
Ivan Savenko
f4bbcd0ed4
Merge pull request #1539 from dydzio0614/fixScriptingCompilation
Fix scripting compilation
2023-02-02 12:21:11 +02:00
Ivan Savenko
5f046f25a2
Merge pull request #1535 from IvanSavenko/client_files_layout_rearrangement
Reorganize client source files
2023-02-02 12:20:54 +02:00
Ivan Savenko
5e45672c80
Merge pull request #1541 from IvanSavenko/beta_release
Final changes for release of 1.1.1
2023-02-02 12:19:55 +02:00
Ivan Savenko
0a63014041 Add 1.1.1 release information 2023-02-02 00:52:35 +02:00