  Nordsoft91andGitHub
|
def927f8be
|
Merge pull request #3106 from Nordsoft91/editor-improvements-1.4
Fixes for map editor
|
2023-10-26 23:23:02 +02:00 |
|
|
Nordsoft91andGitHub
|
8824835c09
|
Merge pull request #3096 from Alexander-Wilms/develop
Add CI stage to ensure LF line endings
|
2023-10-26 23:19:40 +02:00 |
|
|
Nordsoft91andGitHub
|
8f2b50a5e2
|
Merge pull request #3095 from Laserlicht/team_alignment
fix team alignments
|
2023-10-26 23:19:18 +02:00 |
|
|
Nordsoft91andGitHub
|
f3acc939b9
|
Merge pull request #3062 from Laserlicht/sort_towns
sort town/hero feature
|
2023-10-20 22:51:26 +02:00 |
|
|
Nordsoft91andGitHub
|
12b179ef1f
|
Merge pull request #3057 from Laserlicht/rw_hero
|
2023-10-20 01:42:06 +02:00 |
|
|
Nordsoft91andGitHub
|
d03b75696a
|
Merge pull request #3067 from Nordsoft91/editor-improvements-1.4
Add hero placeholder properties
|
2023-10-19 22:23:58 +02:00 |
|
|
Nordsoft91andGitHub
|
1ffc246c8b
|
Merge pull request #3051 from Laserlicht/name_change
possibility to change name in lobby
|
2023-10-16 22:28:31 +02:00 |
|
|
Nordsoft91andGitHub
|
02c1425939
|
Merge pull request #3046 from Nordsoft91/editor-improvements-1.4
Add map editor zoom and objects lock functionality
|
2023-10-16 01:22:18 +02:00 |
|
|
Nordsoft91andGitHub
|
ee997a291c
|
Merge pull request #3045 from Laserlicht/interface_improvement
various interface shortcuts
|
2023-10-15 23:48:22 +02:00 |
|
|
Nordsoft91andGitHub
|
71b47bfb72
|
Merge pull request #3055 from Nordsoft91/revert-2959
Revert "Merge pull request #2959 from Alexander-Wilms/faster-server-c…
|
2023-10-15 22:18:20 +02:00 |
|
|
Nordsoft91andGitHub
|
3906217ef5
|
Merge pull request #3049 from Warzyw647/fix-morale-chance-lookup
Fixed morale and luck chance lookup.
|
2023-10-14 21:39:57 +02:00 |
|
|
Nordsoft91andGitHub
|
aa25ab6488
|
Merge pull request #3035 from Nordsoft91/quests
Quests rework
|
2023-10-14 21:38:15 +02:00 |
|
|
Nordsoft91andGitHub
|
802e1bb961
|
Merge pull request #3042 from Laserlicht/crash_preview
[fix] crash with custom campaign preview
|
2023-10-13 10:57:02 +02:00 |
|
|
Nordsoft91andGitHub
|
093c8149e5
|
Merge pull request #3040 from Laserlicht/infobox_next
|
2023-10-13 10:38:32 +02:00 |
|
|
Nordsoft91andGitHub
|
ab36692847
|
Merge pull request #3037 from Laserlicht/missing_res
|
2023-10-13 10:36:33 +02:00 |
|
|
Nordsoft91andGitHub
|
4ae123e2a1
|
Merge pull request #3038 from Alexander-Wilms/connection-error-window
Show info dialog when connection to multiplayer server fails
|
2023-10-12 00:16:04 +02:00 |
|
|
Nordsoft91andGitHub
|
ecd01fd53c
|
Merge pull request #3039 from Laserlicht/townhall_click
|
2023-10-11 18:43:59 +02:00 |
|
|
Nordsoft91andGitHub
|
3f3c079c0e
|
Merge pull request #3032 from Nordsoft91/editor-improvements-1.4
Random dwellings can be connected to town types
|
2023-10-10 23:42:18 +02:00 |
|
|
Nordsoft91andGitHub
|
773fb965ba
|
Merge pull request #3028 from Nordsoft91/fixes
Fix campaign advance crash
|
2023-10-10 23:41:52 +02:00 |
|
|
Nordsoft91andGitHub
|
25952f8223
|
Merge pull request #3027 from Nordsoft91/turn-timer
Add game pause
|
2023-10-10 23:41:36 +02:00 |
|
|
Nordsoft91andGitHub
|
1fcbe8df5f
|
Merge pull request #3026 from Laserlicht/firewall_rules
install firewall rules with installer
|
2023-10-10 00:45:41 +02:00 |
|
|
Nordsoft91andGitHub
|
6c151e283a
|
Merge pull request #3036 from Alexander-Wilms/disable-ccache-by-default
Set ENABLE_CCACHE to OFF by default
|
2023-10-10 00:45:02 +02:00 |
|
|
Nordsoft91andGitHub
|
c9dc87756b
|
Merge pull request #3031 from Alexander-Wilms/ccache-docs
Mention ccache in developer docs
|
2023-10-10 00:44:39 +02:00 |
|
|
Nordsoft91andGitHub
|
b6da60b105
|
Merge pull request #3023 from Laserlicht/video_audio
audio from SMK video file
|
2023-10-10 00:40:33 +02:00 |
|
|
Nordsoft91andGitHub
|
43636af2e4
|
Merge pull request #2959 from Alexander-Wilms/faster-server-connection
Sleep for 10 ms instead of 1000 ms while waiting for server connection
|
2023-10-08 17:21:57 +02:00 |
|
|
Nordsoft91andGitHub
|
aed2e360ba
|
Merge pull request #2997 from Alexander-Wilms/fix-ios-pch
Enable ccache for iOS and MSVC builds
|
2023-10-08 16:10:07 +02:00 |
|
|
Nordsoft91andGitHub
|
088ce9b948
|
Merge pull request #3013 from Nordsoft91/turn-timer
|
2023-10-08 12:11:44 +02:00 |
|
|
Nordsoft91andGitHub
|
1c4bbf1078
|
Merge pull request #3012 from Nordsoft91/fixes
|
2023-10-08 12:11:32 +02:00 |
|
|
Nordsoft91andGitHub
|
e41c767653
|
Merge pull request #3010 from SoundSSGood/arts-placement-fix
|
2023-10-08 12:11:20 +02:00 |
|
|
Nordsoft91andGitHub
|
d517ca9ba7
|
Merge pull request #2990 from Laserlicht/patch-4map_overview_rework
Map preview rework
|
2023-10-02 22:33:35 +02:00 |
|
|
Nordsoft91andGitHub
|
80be1e9f4c
|
Merge pull request #2981 from Nordsoft91/rmg-template
Select random object template instead of first
|
2023-10-02 20:42:39 +02:00 |
|
|
Nordsoft91andGitHub
|
4620d2c96d
|
Merge pull request #2980 from Nordsoft91/proxy-reconnect
Allow to reconnect to proxy server
|
2023-10-02 20:42:11 +02:00 |
|
|
Nordsoft91andGitHub
|
c57d5545c2
|
Merge pull request #2971 from Nordsoft91/translations
Multi-language support for network game and for VMAPs
|
2023-10-02 20:41:42 +02:00 |
|
|
Nordsoft91andGitHub
|
d695d87b99
|
Merge pull request #2964 from kambala-decapitator/fix-docs
improve layout of developer docs
|
2023-10-01 14:08:38 +02:00 |
|
|
Nordsoft91andGitHub
|
041ffceb07
|
Merge pull request #2952 from Alexander-Wilms/develop
Enable VSync to prevent screen tearing while scrolling across map
|
2023-10-01 14:08:00 +02:00 |
|
|
Nordsoft91andGitHub
|
818e11f364
|
Merge pull request #2982 from Nordsoft91/fix-pandora
|
2023-09-30 20:24:25 +02:00 |
|
|
Nordsoft91andGitHub
|
f54a3c4e6c
|
Merge pull request #2960 from Alexander-Wilms/ccache
Enable ccache for CI
|
2023-09-30 01:57:48 +02:00 |
|
|
Nordsoft91andGitHub
|
811680c4c5
|
Merge pull request #2978 from Laserlicht/height
|
2023-09-29 09:36:21 +02:00 |
|
|
Nordsoft91andGitHub
|
8c6381b497
|
Merge pull request #2951 from Laserlicht/spell_icon
specific spell icon (artifacts)
|
2023-09-26 20:13:19 +02:00 |
|
|
Nordsoft91andGitHub
|
12eac2d4ba
|
Merge pull request #2941 from Laserlicht/spellbook
Big Spellbook
|
2023-09-26 20:12:30 +02:00 |
|
|
Nordsoft91andGitHub
|
c803b57c33
|
Merge pull request #2889 from Nordsoft91/mod-compatibility-check
Proper mod compatibility check logic
|
2023-09-26 19:29:46 +02:00 |
|
|
Nordsoft91andGitHub
|
9042778bcb
|
Merge pull request #2937 from Nordsoft91/lobby
[!] Fix issue with impossible room ready status
|
2023-09-24 23:37:39 +02:00 |
|
|
Nordsoft91andGitHub
|
ed2e5c6fd2
|
Merge pull request #2934 from Laserlicht/hotseat_hide
|
2023-09-24 14:12:19 +02:00 |
|
|
Nordsoft91andGitHub
|
1f2ca138dd
|
Merge pull request #2919 from Nordsoft91/fix-2893
|
2023-09-23 18:02:33 +02:00 |
|
|
Nordsoft91andGitHub
|
a36450e2d1
|
Merge pull request #2882 from Nordsoft91/ai-cheating
Add basic system to give more advantages for ai player
|
2023-09-23 03:21:19 +02:00 |
|
|
Nordsoft91andGitHub
|
ec582328b4
|
Merge pull request #2887 from Laserlicht/campaign_improvement
campaign improvements
|
2023-09-22 01:01:59 +02:00 |
|
|
Nordsoft91andGitHub
|
dc6144bffe
|
Merge pull request #2880 from Nordsoft91/fix-1787
|
2023-09-20 22:19:20 +02:00 |
|
|
Nordsoft91andGitHub
|
5a8c3b5ae2
|
Merge pull request #2869 from Laserlicht/audio
disable audio on lost focus
|
2023-09-20 13:20:47 +02:00 |
|
|
Nordsoft91andGitHub
|
461aa97d7e
|
Merge pull request #2864 from Laserlicht/double_tap
support double tap
|
2023-09-19 19:37:49 +02:00 |
|
|
Nordsoft91andGitHub
|
648e8c7acb
|
Merge pull request #2856 from Laserlicht/hero_overview
Hero overview
|
2023-09-19 19:36:19 +02:00 |
|
|
Nordsoft91andGitHub
|
807f308c91
|
Merge pull request #2844 from Nordsoft91/rewardable-quests
New rewardable interface for SeerHuts and pandoras
|
2023-09-19 17:59:24 +02:00 |
|
|
Nordsoft91andGitHub
|
d225bdb1cd
|
Merge pull request #2858 from Alexander-Wilms/launcher-icon-sizes
Use 64px and 32px as icon sizes in launcher sidebar
|
2023-09-18 02:02:31 +02:00 |
|
|
Nordsoft91andGitHub
|
86b0804be3
|
Merge pull request #2841 from krs0/quickfix/fix_market_of_time_missing_template
Fix Market of Time missing Template
|
2023-09-18 01:49:41 +02:00 |
|
|
Nordsoft91andGitHub
|
717a765123
|
Merge pull request #2813 from Laserlicht/textcolor
Textcolor support
|
2023-09-16 14:12:17 +02:00 |
|
|
Nordsoft91andGitHub
|
2d6ef9049a
|
Merge pull request #2827 from Laserlicht/select_instead_path
|
2023-09-15 20:28:51 +02:00 |
|
|
Nordsoft91andGitHub
|
1f3f3ed603
|
Merge pull request #2829 from Laserlicht/level_up_easy
|
2023-09-15 20:26:47 +02:00 |
|
|
Nordsoft91andGitHub
|
01ffe40ae2
|
Merge pull request #2812 from cewbdex/patch-1
|
2023-09-14 15:26:01 +02:00 |
|
|
Nordsoft91andGitHub
|
dc19f5b3b9
|
Merge pull request #2816 from Laserlicht/folder
|
2023-09-14 15:24:15 +02:00 |
|
|
Nordsoft91andGitHub
|
9998b16050
|
Merge pull request #2807 from Nordsoft91/editor-improvements-1.4
|
2023-09-14 15:22:24 +02:00 |
|
|
Nordsoft91andGitHub
|
2db6a75028
|
Merge pull request #2786 from vcmi/lobby
Minor improvements for launcher
|
2023-09-12 23:37:22 +02:00 |
|
|
Nordsoft91andGitHub
|
7f321b2fcb
|
Merge pull request #2800 from PandarinDev/missing_exp_for_towns
Award 500 experience for towns conquered during a battle.
|
2023-09-12 00:39:47 +02:00 |
|
|
Nordsoft91andGitHub
|
0a799ecc46
|
Merge pull request #2740 from Laserlicht/fix_cursor_issue
|
2023-09-11 22:20:11 +02:00 |
|
|
Nordsoft91andGitHub
|
96433436dd
|
Merge pull request #2782 from Nordsoft91/editor-improvements-1.4
Map editor: events, rumors
|
2023-09-11 20:36:13 +02:00 |
|
|
Nordsoft91andGitHub
|
a18aa2cf7e
|
Merge pull request #2802 from Laserlicht/voice_camp
Voice for campaigns
|
2023-09-11 18:15:23 +02:00 |
|
|
Nordsoft91andGitHub
|
0b0ca3172d
|
Merge pull request #2788 from Nordsoft91/quick-combat
|
2023-09-10 16:39:11 +02:00 |
|
|
Nordsoft91andGitHub
|
0756f3caf8
|
Merge pull request #2787 from Nordsoft91/fix-2766
|
2023-09-10 11:27:27 +02:00 |
|
|
Nordsoft91andGitHub
|
0d7f3e61c2
|
Merge pull request #2789 from vcmi/Nordsoft91-patch-2
Update mod.json schema
|
2023-09-10 02:08:48 +02:00 |
|
|
Nordsoft91andGitHub
|
d011e1ff0d
|
Update mod.json schema
|
2023-09-09 15:24:52 +02:00 |
|
|
Nordsoft91andGitHub
|
93b889eb0f
|
Merge pull request #2785 from vcmi/Nordsoft91-patch-1
|
2023-09-09 10:14:42 +02:00 |
|
|
Nordsoft91andGitHub
|
d6ff553cac
|
Fix typo
|
2023-09-09 02:14:27 +02:00 |
|
|
Nordsoft91andGitHub
|
24ad06b5c3
|
Merge pull request #2726 from Nordsoft91/launcher-size-support
|
2023-09-08 05:47:06 +04:00 |
|
|
Nordsoft91andGitHub
|
43ef20efc5
|
Merge pull request #2748 from Nordsoft91/lobby-chat
Advanced chat in lobby
|
2023-09-07 22:01:43 +04:00 |
|
|
Nordsoft91andGitHub
|
a0fead361b
|
Merge pull request #2750 from Nordsoft91/editor-improvements
|
2023-09-05 12:28:41 +04:00 |
|
|
Nordsoft91andGitHub
|
2eaed0c983
|
Merge pull request #2743 from Laserlicht/fix_difficulty_widget
[fix] difficulty widget
|
2023-09-03 17:57:43 +04:00 |
|
|
Nordsoft91andGitHub
|
2057624cbc
|
Merge pull request #2741 from Laserlicht/folder_order
[fix] folder order
|
2023-09-03 17:56:56 +04:00 |
|
|
Nordsoft91andGitHub
|
244db2da33
|
Merge pull request #2739 from Gwart/bugfix/#2646-hero-exchange-server-compliant
#2646 add a null check if creature is empty
|
2023-09-03 11:45:32 +04:00 |
|
|
Nordsoft91andGitHub
|
9af73c2212
|
Merge pull request #2723 from Nordsoft91/versions-fix
Launcher & lib versions unification
|
2023-09-02 19:42:46 +04:00 |
|
|
Nordsoft91andGitHub
|
48e6e0228c
|
Merge pull request #2722 from Nordsoft91/launcher-doubleclick
Launcher mod double click behavior
|
2023-09-02 19:42:28 +04:00 |
|
|
Nordsoft91andGitHub
|
91565225c6
|
Merge pull request #2728 from Nordsoft91/turn-timer-fix
|
2023-09-02 16:29:20 +04:00 |
|
|
348b6b0f32
|
Update launcher/modManager/cmodlistview_moc.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
|
2023-09-02 14:11:56 +04:00 |
|
|
Nordsoft91andGitHub
|
c45ab07d0b
|
Merge pull request #2698 from Nordsoft91/turn-timer
Turn timer fixes
|
2023-09-01 00:31:52 +04:00 |
|
|
Nordsoft91andGitHub
|
49614f5851
|
Merge pull request #2695 from Nordsoft91/mod-compatibility
|
2023-08-31 12:14:54 +04:00 |
|
|
Nordsoft91andGitHub
|
2022d55d40
|
Merge pull request #2692 from Nordsoft91/accept-turn
Accept turn query
|
2023-08-28 19:44:46 +04:00 |
|
|
Nordsoft91andGitHub
|
8e9dd697ff
|
Merge pull request #2674 from Nordsoft91/turn-timer
Chess Timer UI and battle timer fixes
|
2023-08-28 18:53:41 +04:00 |
|
|
Nordsoft91andGitHub
|
1586c6c6a0
|
Merge pull request #2668 from IvanSavenko/remove_current_player
Remove "currentPlayer" from gamestate
|
2023-08-28 17:10:28 +04:00 |
|
|
Nordsoft91andGitHub
|
6394a77270
|
Merge pull request #2683 from Laserlicht/zoom_dead_area
dead area for zooming
|
2023-08-28 17:09:15 +04:00 |
|
|
Nordsoft91andGitHub
|
ffc4b989f0
|
Merge pull request #2679 from Laserlicht/smooth_scroll
Smooth scroll
|
2023-08-28 17:08:57 +04:00 |
|
|
Nordsoft91andGitHub
|
979cf129bc
|
Merge pull request #2637 from Laserlicht/autosave
|
2023-08-25 00:09:49 +04:00 |
|
|
Nordsoft91andGitHub
|
07210973f4
|
Merge pull request #2653 from Nordsoft91/turn-timer
|
2023-08-25 00:09:00 +04:00 |
|
|
Nordsoft91andGitHub
|
db542d2710
|
Merge pull request #2664 from Nordsoft91/fix-ai-movement-freeze
|
2023-08-25 00:08:40 +04:00 |
|
|
Nordsoft91andGitHub
|
1bad0e96ef
|
Merge pull request #2635 from Nordsoft91/loading-bar
Loading progress bar
|
2023-08-23 17:28:19 +04:00 |
|
|
Nordsoft91andGitHub
|
e09b13c00a
|
Merge pull request #2576 from Nordsoft91/turn-timer
Implement turn timer feature
|
2023-08-23 01:48:12 +04:00 |
|
|
Nordsoft91andGitHub
|
ec4da06b56
|
Merge pull request #2631 from Laserlicht/date_alignment
date alignment
|
2023-08-22 02:00:49 +04:00 |
|
|
Nordsoft91andGitHub
|
4edee00a97
|
Merge pull request #2605 from Laserlicht/map_preview
Map preview
|
2023-08-21 14:56:21 +04:00 |
|
|
Nordsoft91andGitHub
|
2f5bd1423c
|
Merge pull request #2623 from Nordsoft91/tutorial
|
2023-08-20 23:20:27 +04:00 |
|
|
Nordsoft91andGitHub
|
ef4fddd0c4
|
Merge pull request #2570 from Laserlicht/town_selection_window
Town selection window
|
2023-08-20 17:37:45 +04:00 |
|
|
Nordsoft91andGitHub
|
e283a80146
|
Merge pull request #2584 from krs0/feature/Remove_wog_artifacts_from_SoD
Removed WoG artifacts from core. Replaced with unused to avoid crashes.
|
2023-08-20 03:32:49 +04:00 |
|
|
Nordsoft91andGitHub
|
4a6deedd5e
|
Merge pull request #2530 from Nordsoft91/tutorial
Support tutorial
|
2023-08-19 18:06:15 +04:00 |
|
|
Nordsoft91andGitHub
|
96e820ddac
|
Merge pull request #2517 from Laserlicht/folders
|
2023-08-17 10:09:37 +04:00 |
|
|
Nordsoft91andGitHub
|
e23936f6dc
|
Merge pull request #2107 from Nordsoft91/town-buildings
|
2023-05-07 06:04:52 +04:00 |
|