Skip to content

Commit

Permalink
issue #75 and bug fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
Shikyo Kira committed Oct 5, 2018
1 parent 1284351 commit 0470b8d
Show file tree
Hide file tree
Showing 1,746 changed files with 10,302 additions and 1,505,354 deletions.
22 changes: 21 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# Nemesis created files
animationdata_list
animationsetdata_list
behavior_joints
behavior_path
behavior_project
behavior_project_path
engine_update
settings
PatchLog.txt
UpdateLog.txt
/data
*.bat
*.lua
*.hkx
*.pex
*.psc
TESV_Papyrus_Flags.flg

# User-specific files
*.suo
*.user
Expand Down Expand Up @@ -242,4 +261,5 @@ ModelManifest.xml
.paket/paket.exe

# FAKE - F# Make
.fake/
.fake/
/Nemesis Main GUI/Papyrus Compiler
5 changes: 1 addition & 4 deletions Nemesis Main GUI/GeneratedFiles/ui_NemesisMainGUI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "BehaviorListView.h"
#include "ErrorMsgBox.h"
#include "SettingsSave.h"
#include "BehaviorListRowColor.h"
#include "AnimProgressBar.h"

QT_BEGIN_NAMESPACE
Expand Down Expand Up @@ -77,8 +76,7 @@ class Ui_NemesisMainGUIClass
modView->setEditTriggers(QAbstractItemView::EditKeyPressed | QAbstractItemView::SelectedClicked);
modView->setDragEnabled(true);
modView->setAcceptDrops(true);
modView->setDropIndicatorShown(true);
modView->setDragDropMode(QAbstractItemView::DragDrop);
modView->setDropIndicatorShown(false);
modView->setDefaultDropAction(Qt::MoveAction);
modView->setAlternatingRowColors(true);
modView->setSelectionMode(QAbstractItemView::ExtendedSelection);
Expand Down Expand Up @@ -223,7 +221,6 @@ class Ui_NemesisMainGUIClass
}
}

modView->setItemDelegate(new BehaviorListRowDelegate(modView->model(), indexlist));
modView->setColumnWidth(0, 380);
modView->setColumnWidth(1, 75);
modView->setColumnWidth(2, 47);
Expand Down
2 changes: 0 additions & 2 deletions Nemesis Main GUI/Nemesis Main GUI.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@
<ClCompile Include="src\AnimProgressBar.cpp" />
<ClCompile Include="src\BehaviorInfo.cpp" />
<ClCompile Include="src\BehaviorListModel.cpp" />
<ClCompile Include="src\BehaviorListRowColor.cpp" />
<ClCompile Include="src\DebugLog.cpp" />
<ClCompile Include="src\MultiInstanceCheck.cpp" />
<ClCompile Include="src\ScrollBar.cpp" />
Expand Down Expand Up @@ -164,7 +163,6 @@
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)src;C:\Program Files\boost\boost_1_66_0\msvc\include\boost-1_66;.;.\GeneratedFiles;$(SolutionDir)\.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName)\.;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;C:\Program Files (x86)\Visual Leak Detector\include</IncludePath>
<Define Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB</Define>
</QtMoc>
<ClInclude Include="src\BehaviorListRowColor.h" />
<ClInclude Include="src\MultiInstanceCheck.h" />
<ClInclude Include="src\SettingsSave.h" />
<QtMoc Include="BehaviorListView.h" />
Expand Down
6 changes: 0 additions & 6 deletions Nemesis Main GUI/Nemesis Main GUI.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
<ClCompile Include="src\AnimProgressBar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\BehaviorListRowColor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ErrorMsgBox.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -113,9 +110,6 @@
<ClInclude Include="src\SettingsSave.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\BehaviorListRowColor.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ErrorMsgBox.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down
768 changes: 349 additions & 419 deletions Nemesis Main GUI/PatchLog.txt
View file

Large diffs are not rendered by default.

312 changes: 156 additions & 156 deletions Nemesis Main GUI/UpdateLog.txt
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Nemesis Main GUI/behavior templates/b/behavior/#0110.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<hkparam name="exitTime">0.000000</hkparam>
</hkobject>
</hkparam>
<!-- CONDITION START ^B^ -->
<hkparam name="transition">#$import[blend_transition][B[duration]]$</hkparam>
<!-- CONDITION START ^b[][B]^ -->
<hkparam name="transition">#$import[blend_transition][b[][B][duration]]$</hkparam>
<!-- CONDITION -->
<hkparam name="transition">#0111</hkparam>
<!-- CONDITION END -->
Expand Down
6 changes: 3 additions & 3 deletions Nemesis Main GUI/behavior templates/km/0_master/#0789.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<hkparam name="transition">#0111</hkparam>
<hkparam name="condition">null</hkparam>
<hkparam name="eventId">$eventID[main_anim_event]$</hkparam>
<hkparam name="toStateId">$(S+0)$</hkparam>
<hkparam name="toStateId">$(S+1)$</hkparam>
<hkparam name="fromNestedStateId">0</hkparam>
<hkparam name="toNestedStateId">0</hkparam>
<hkparam name="priority">0</hkparam>
Expand All @@ -202,8 +202,8 @@
</hkparam>
<hkparam name="transition">#0111</hkparam>
<hkparam name="condition">null</hkparam>
<hkparam name="eventId">$eventID[pa_main_anim_event]$</hkparam>
<hkparam name="toStateId">$(S+1)$</hkparam>
<hkparam name="eventId">$eventID[pa_[main_anim_event]]$</hkparam>
<hkparam name="toStateId">$(S+0)$</hkparam>
<hkparam name="fromNestedStateId">0</hkparam>
<hkparam name="toNestedStateId">0</hkparam>
<hkparam name="priority">0</hkparam>
Expand Down
4 changes: 2 additions & 2 deletions Nemesis Main GUI/behavior templates/km/0_master/km.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<hkobject name="#MID$7" class="BSSynchronizedClipGenerator" signature="0xd83bea64">
<hkparam name="variableBindingSet">null</hkparam>
<hkparam name="userData">0</hkparam>
<hkparam name="name">Nemesis_Player_KillMove_BS_$%$</hkparam>
<hkparam name="name">pa_$main_anim_event$</hkparam>
<hkparam name="pClipGenerator">#MID$8</hkparam>
<hkparam name="SyncAnimPrefix">&#9216;</hkparam>
<hkparam name="bSyncClipIgnoreMarkPlacement">false</hkparam>
Expand Down Expand Up @@ -348,7 +348,7 @@
<hkobject name="#MID$17" class="BSSynchronizedClipGenerator" signature="0xd83bea64">
<hkparam name="variableBindingSet">null</hkparam>
<hkparam name="userData">0</hkparam>
<hkparam name="name">NPC_Nemesis_KillMove_BS_$%$</hkparam>
<hkparam name="name">$main_anim_event$</hkparam>
<hkparam name="pClipGenerator">#MID$18</hkparam>
<hkparam name="SyncAnimPrefix">2_</hkparam>
<hkparam name="bSyncClipIgnoreMarkPlacement">false</hkparam>
Expand Down
6 changes: 6 additions & 0 deletions Nemesis Main GUI/behavior templates/km/animationdatasinglefile/DefaultMale/$km$.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
NPC_Nemesis_KillMove_Clip_$%$
<!-- This line is deliberately left without any related info as it will be replaced by the generator -->
1
0
0
0
3 changes: 3 additions & 0 deletions Nemesis Main GUI/behavior templates/km/animationdatasinglefile/DefaultMale/$km$UC.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<!-- This line is deliberately left without any related info as it will be replaced by the generator -->
$MD$
$RD$
0 ...le/DefaultFemaleData/$NPCNemesisPair$.txt → ...leData~DefaultFemale/$NPCNemesisPair$.txt
View file
File renamed without changes.
0 ...DefaultFemaleData/$PlayerNemesisPair$.txt → ...ata~DefaultFemale/$PlayerNemesisPair$.txt
View file
File renamed without changes.
Loading

0 comments on commit 0470b8d

Please sign in to comment.