Merge pull request #29 from Sognus/develop

Version 1.4.0.0

BuildVersion.h

@@ -1,4 +1,4 @@
 #ifndef GW2_BOSSES_VERSION_BUILD  
 #define GW2_BOSSES_VERSION_BUILD  
-#define VERSION_REVISION 250  
+#define VERSION_REVISION 308  
 #endif // GW2_BOSSES_VERSION_BUILD 

GW2-Bosses.vcxproj

@@ -36,6 +36,7 @@
     <ClCompile Include="src\tinyxml2\tinyxml2.cpp" />
     <ClCompile Include="src\tinyxml2\xmltest.cpp" />
     <ClCompile Include="src\utils\BoundingBox.cpp" />
+    <ClCompile Include="src\utils\JsonExtension.cpp" />
     <ClCompile Include="src\utils\Map.cpp" />
     <ClCompile Include="src\utils\Render.cpp" />
     <ClCompile Include="src\utils\Strings.cpp" />
@@ -64,6 +65,7 @@
     <ClInclude Include="src\PeriodicEvent.h" />
     <ClInclude Include="src\tinyxml2\tinyxml2.h" />
     <ClInclude Include="src\utils\BoundingBox.h" />
+    <ClInclude Include="src\utils\JsonExtension.h" />
     <ClInclude Include="src\utils\Map.h" />
     <ClInclude Include="src\utils\Render.h" />
     <ClInclude Include="src\utils\Strings.h" />
@@ -76,6 +78,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="resources\boss_gray.png" />
+    <Image Include="resources\boss_in_edit.png" />
     <Image Include="resources\boss_in_progress.png" />
     <Image Include="resources\boss_upcoming.png" />
   </ItemGroup>
@@ -143,6 +146,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -160,6 +164,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -183,6 +188,7 @@
       <UndefinePreprocessorDefinitions>
       </UndefinePreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -232,6 +238,7 @@ echo Build number updated: %buildVersionFile% -^&gt; %buildVersion%</Command>
       <UndefinePreprocessorDefinitions>
       </UndefinePreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

GW2-Bosses.vcxproj.filters

@@ -84,6 +84,9 @@
     <ClCompile Include="src\imgui\imgui_widgets.cpp">
       <Filter>Libraries\imgui</Filter>
     </ClCompile>
+    <ClCompile Include="src\utils\JsonExtension.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\mumble\Mumble.h">
@@ -164,6 +167,9 @@
     <ClInclude Include="src\imgui\imstb_truetype.h">
       <Filter>Libraries\imgui</Filter>
     </ClInclude>
+    <ClInclude Include="src\utils\JsonExtension.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="patchnotes.md">
@@ -186,6 +192,9 @@
     <Image Include="resources\boss_gray.png">
       <Filter>Resource Files</Filter>
     </Image>
+    <Image Include="resources\boss_in_edit.png">
+      <Filter>Resource Files</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resource.rc">

README.md

@@ -20,7 +20,21 @@ Install via the [Nexus](https://raidcore.gg/Nexus) Addon Library or download the
 
 ## Customization
 
-Currently there is no easy way to customize rendered events, it is a feature planned for future. If you want to change color, open data.json and change `color_hex` value of event which color you want to change. Then unload and load addon again.
+Currently there are not many options to customize rendered events. Limited editor is available.
+
+### Event editor and selecting event to edit
+
+You can find event editor in **Nexus options -> Addons -> World bosses -> Editor**. 
+
+- You can either select an event from the dropdown menu (Note: If the event is numbered, the number indicates its order of occurrence from midnight, starting at 1)
+- Alternatively, you can select an event by pressing CTRL+CLICK on it in the map.
+- An event selected for editing that is enabled will have a green outline to indicate selection.
+- An event selected for editing that is disabled will have a red outline to indicate selection.
+- You can change its location by adjusting the numerical values in the form.
+- You can enable or disable its rendering using **enabled** dropdown.
+- Changing the base color for an event is currently not implemented.
+- Press the save button to apply changes (unsaved changes will be discarded).
+
 
 ## Troubleshooting and feature requests
 

build

@@ -1 +1 @@
-250  
+308  

patchnotes.md

@@ -1,3 +1,37 @@
+## Version 1.4.0.0
+
+### Fixed
+- Editor save button should now correctly export data to data.json
+
+### Added
+- Janthir Syntri meta event timer
+- Option to disable event render in  **Nexus options -> Addons -> World bosses -> Editor**, currently edited event is still visible and it has red outline to indicate event render is disabled
+
+### Changed
+- Data loading: Fallback load is always being called, base events that are missing in data.json will be automatically added. If you wish to remove event, disable it in editor
+
+### Known issues
+- Calculation of event render position is slightly wrong for larger interface sizes, especially when changing the map view. This affects older versions as well and has no easy solution at the moment. 
+- Change of DPI scale is slightly delayed after checked/unchecked in Guild Wars 2 settings, this is not a bug.
+- It is much more easier to select events to edit when zoomed in, it is supposed to be just slight QoL, not main functionality. To implement this, custom WND proc was needed and it is not perfect.
+
+## Version 1.3.1.0
+
+### Fixed
+- Fixed compatibility issue of Convergences event tooltip for linux users (incompatibility with windows' _mkgmtime)
+
+### Added
+- Experimental usage of Nexus' alerts for core world boss events (enable/disable in options)
+
+### Changed
+- Core world boss event that is not active and is currently being edited is shown as green cog on the map. 
+- Debug version now have special debug controls
+
+### Known issues
+- Calculation of event render position is slightly wrong for larger interface sizes, especially when changing the map view. This affects older versions as well and has no easy solution at the moment. 
+- Change of DPI scale is slightly delayed after checked/unchecked in Guild Wars 2 settings, this is not a bug.
+- It is much more easier to select events to edit when zoomed in, it is supposed to be just slight QoL, not main functionality. To implement this, custom WND proc was needed and it is not perfect.
+
 ## Version 1.3.0.0
 
 ### Added

resource.h

@@ -6,12 +6,13 @@
 #define IMAGE_COREWORLDBOSSES_UPCOMING  103
 #define IDB_PNG1                        104
 #define IMAGE_COREWORLDBOSSES_GRAY      104
+#define IMAGE_COREWORLDBOSSES_IN_EDIT   105
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        105
+#define _APS_NEXT_RESOURCE_VALUE        106
 #define _APS_NEXT_COMMAND_VALUE         40001
 #define _APS_NEXT_CONTROL_VALUE         1001
 #define _APS_NEXT_SYMED_VALUE           101