Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into main branch #66

Merged
merged 40 commits into from
Oct 4, 2021
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
06421ef
Init
mrSkortch Jul 1, 2020
f0f5e35
Events Change
mrSkortch Jul 1, 2020
a6e6b84
Stats display as own File
mrSkortch Jul 1, 2020
1d1602a
Hooks update
mrSkortch Jul 1, 2020
21aa034
Parity with last 7_5 update and custom stats
mrSkortch Jul 24, 2020
37e2eda
Updated Config Formatting
mrSkortch Jul 29, 2020
ac802df
Dynamic Config Progress
mrSkortch Jul 29, 2020
8caf45f
More Progress
mrSkortch Jul 30, 2020
c38fce4
Updated config functional
mrSkortch Sep 4, 2020
da7379c
WIP Stats changes
mrSkortch Sep 8, 2020
1bc15cf
Assists now working
mrSkortch Sep 16, 2020
ad35ca2
coa and AI stats progress
mrSkortch Sep 17, 2020
173d49a
Working Coalition and Campaign Stats
mrSkortch Sep 20, 2020
ace1bae
Fixes and tweaks
mrSkortch Sep 25, 2020
7d91596
Branch publish
mrSkortch Sep 25, 2020
8db7d88
Minor stats fixes
mrSkortch Sep 26, 2020
6dc3f39
Stats fixes
mrSkortch Sep 28, 2020
ca7b670
More Stats fixes
mrSkortch Sep 29, 2020
2bac2fa
Landing stats tweaks
mrSkortch Oct 1, 2020
d90af0d
Landing Stats fixes
mrSkortch Oct 1, 2020
ab59759
Merge branch 'develop' into 7_6_prelim
mrSkortch Oct 1, 2020
27a39f8
Merge pull request #61 from mrSkortch/7_6_prelim
mrSkortch Oct 1, 2020
effe4a1
Bug fixes
mrSkortch Oct 23, 2020
cbaca87
Fix for attempted Fix
mrSkortch Oct 26, 2020
6825ea1
Stats display fixes
mrSkortch Oct 26, 2020
3101c3f
Minor fixes and debugging lines
mrSkortch Oct 27, 2020
465c045
Added mission command to kick to spectators
mrSkortch Nov 5, 2020
91e5f21
Commented out message
mrSkortch Nov 16, 2020
89c45d2
Stats Display Fix
mrSkortch Dec 15, 2020
17bf67a
Multicrew changes, stats buffer, json, and WIP toward a future feature
mrSkortch Dec 17, 2020
452a0f8
Disabled stats buffer
mrSkortch Dec 18, 2020
10b48ee
moved json conversion
mrSkortch Dec 18, 2020
acca49a
Minor fixes
mrSkortch Jan 16, 2021
7461488
Minor fix for collision stats
mrSkortch Jan 23, 2021
2ef8b0f
PvP Stat fixes
mrSkortch Feb 6, 2021
c7f8702
Fixed mistaken merge
mrSkortch Feb 9, 2021
f1d68c1
Mission Events and Config stuff
mrSkortch Mar 4, 2021
07717cf
Fixes for 2.7
mrSkortch Apr 18, 2021
4974296
Hotfix DCS 2.7.1
mrSkortch May 22, 2021
ed9c2cc
Stat display fixes
mrSkortch Aug 26, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Hotfix DCS 2.7.1
Fixed an issue with gun stats caused by slight event format change in the patch.
mrSkortch committed May 22, 2021
commit 49742962b2fe636c9ddc070df5ac3a22e7debe14
2 changes: 1 addition & 1 deletion Scripts/net/Slmodv7_6/SlmodConfig.lua
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ slmod.config = slmod.config or {}
slmod.version = '7_6' -- file directory

slmod.mainVersion = '7_6' -- so far, these are only used in MOTD and some load scripts.
slmod.buildVersion = '148'
slmod.buildVersion = '149'

slmod.configVersion = '28' -- as new options as are added to SlmodConfig, this will change.

2 changes: 1 addition & 1 deletion Scripts/net/Slmodv7_6/SlmodEvents.lua
Original file line number Diff line number Diff line change
@@ -1033,7 +1033,7 @@ do
-- env.info('debrief events')
local dEvent = slmod.debriefEvents[#slmod.debriefEvents]
--env.info(slmod.oneLineSerialize(dEvent))
if dEvent.t == newEvent.t and dEvent.type == newEvent.type then
if dEvent.type == newEvent.type and dEvent.initiatorPilotName == newEvent.initiatorPilotName then
newEvent.weapon = dEvent.weapon
end
end