Merge branch 'develop'

johnwdubois · Dec 22, 2021 · 88e91ff · 88e91ff
2 parents 82b9a21 + 4de6486
commit 88e91ff
Show file tree

Hide file tree

Showing 57 changed files with 5,700 additions and 93 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Executables/.DS_Store b/Executables/.DS_Store
diff --git a/Executables/Mac/.DS_Store b/Executables/Mac/.DS_Store
diff --git a/Executables/Mac/Rezonator 0.20.4.dmg.zip b/Executables/Mac/Rezonator 0.20.4.dmg.zip
diff --git a/Executables/Mac/Rezonator 0.21.0.dmg.zip b/Executables/Mac/Rezonator 0.21.0.dmg.zip
diff --git a/Executables/Mac/Rezonator 1.0.9.dmg.zip b/Executables/Mac/Rezonator 1.0.9.dmg.zip
diff --git a/Executables/Windows/.DS_Store b/Executables/Windows/.DS_Store
diff --git a/Executables/Windows/Rezonator 0.15.0.zip b/Executables/Windows/Rezonator 0.15.0.zip
diff --git a/Executables/Windows/Rezonator 0.16.0.zip b/Executables/Windows/Rezonator 0.16.0.zip
diff --git a/Executables/Windows/Rezonator 0.16.1.zip b/Executables/Windows/Rezonator 0.16.1.zip
diff --git a/Executables/Windows/Rezonator 0.17.0.zip b/Executables/Windows/Rezonator 0.17.0.zip
diff --git a/Executables/Windows/Rezonator 0.18.0.zip b/Executables/Windows/Rezonator 0.18.0.zip
diff --git a/Executables/Windows/Rezonator 0.18.1.zip b/Executables/Windows/Rezonator 0.18.1.zip
diff --git a/Executables/Windows/Rezonator 0.19.0.zip b/Executables/Windows/Rezonator 0.19.0.zip
diff --git a/Executables/Windows/Rezonator 0.20.0.zip b/Executables/Windows/Rezonator 0.20.0.zip
diff --git a/Executables/Windows/Rezonator 0.20.1.zip b/Executables/Windows/Rezonator 0.20.1.zip
diff --git a/Executables/Windows/Rezonator 0.20.2.zip b/Executables/Windows/Rezonator 0.20.2.zip
diff --git a/Executables/Windows/Rezonator 0.20.3.zip b/Executables/Windows/Rezonator 0.20.3.zip
diff --git a/Executables/Windows/Rezonator 0.20.4.zip b/Executables/Windows/Rezonator 0.20.4.zip
diff --git a/Executables/Windows/Rezonator 0.21.0.zip b/Executables/Windows/Rezonator 0.21.0.zip
diff --git a/Executables/Windows/Rezonator 1.0.9.zip b/Executables/Windows/Rezonator 1.0.9.zip
diff --git a/Rezonator/Rezonator.yyp b/Rezonator/Rezonator.yyp
diff --git a/Rezonator/datafiles/IncludedFiles/.DS_Store b/Rezonator/datafiles/IncludedFiles/.DS_Store
diff --git a/Rezonator/options/mac/options_mac.yy b/Rezonator/options/mac/options_mac.yy
diff --git a/Rezonator/options/windows/options_windows.yy b/Rezonator/options/windows/options_windows.yy
diff --git a/Rezonator/scripts/.DS_Store b/Rezonator/scripts/.DS_Store
diff --git a/Rezonator/scripts/scr_drawChainPickwhip/scr_drawChainPickwhip.gml b/Rezonator/scripts/scr_drawChainPickwhip/scr_drawChainPickwhip.gml
@@ -54,10 +54,10 @@ function scr_drawChainPickwhip(){
 				if (currentChainVisible) {
 					if (not mouseLineHide) {
 						if (chainType == "resonance") {
-							draw_line_width(mouseLineX, mouseLineY, mouse_x, mouse_y, 2);
+							draw_line_width(mouseLineX, mouseLineY, mouse_x, mouse_y, 3);
 						}
 						else if (chainType == "trail") {
-							scr_drawCurvedLine(mouseLineX, mouseLineY, mouse_x, mouse_y, currentChainColor);
+							scr_drawCurvedLine(mouseLineX, mouseLineY, mouse_x, mouse_y, currentChainColor, 3);
 						}
 						if ((obj_chain.showRezArrows and chainType = "resonance") or (obj_chain.showTrackArrows and chainType = "trail")) {
 							var arrowAngle = point_direction(mouseLineX, mouseLineY, mouse_x, mouse_y);

diff --git a/Rezonator/scripts/scr_drawChains/scr_drawChains.gml b/Rezonator/scripts/scr_drawChains/scr_drawChains.gml
@@ -47,6 +47,7 @@ function scr_drawChains() {
 		var currentChainShowSubMap = obj_chain.chainShowMap[? currentChainID];
 		var currentSetIDList = currentChainShowSubMap[? "entryList"];
 		var currentVizSetIDList = currentChainSubMap[? "vizSetIDList"];
+		var currentChainFocused = obj_chain.currentFocusedChainID == currentChainID;
 
 		if (!scr_isNumericAndExists(currentSetIDList, ds_type_list)) continue;
 		var currentSetIDListSize = ds_list_size(currentSetIDList);
@@ -305,7 +306,7 @@ function scr_drawChains() {
 					if (chainType == "resonance") {
 
 
-						draw_line_width(rezChainLineX1, rezChainLineY1, rezChainLineX2, rezChainLineY2, 2);
+						draw_line_width(rezChainLineX1, rezChainLineY1, rezChainLineX2, rezChainLineY2, currentChainFocused ? 3 : 2);
 
 
 						// mark stretches visually with a circle
@@ -324,10 +325,10 @@ function scr_drawChains() {
 					else if (chainType == "trail") {
 
 						if (sideLink) {
-							draw_line_width(trackChainLineX1, trackChainLineY1, trackChainLineX2, trackChainLineY2, 2);
+							draw_line_width(trackChainLineX1, trackChainLineY1, trackChainLineX2, trackChainLineY2, currentChainFocused ? 3 : 2);
 						}
 						else {
-							scr_drawCurvedLine(trackChainLineX1, lineY1 + (currentWordStringHeight1 / 2), trackChainLineX2, lineY2 - (currentWordStringHeight2 / 2), currentChainColor);
+							scr_drawCurvedLine(trackChainLineX1, lineY1 + (currentWordStringHeight1 / 2), trackChainLineX2, lineY2 - (currentWordStringHeight2 / 2), currentChainColor, currentChainFocused ? 3 : 2);
 						}
 
 					}

diff --git a/Rezonator/scripts/scr_drawChunks/scr_drawChunks.gml b/Rezonator/scripts/scr_drawChunks/scr_drawChunks.gml
@@ -166,20 +166,19 @@ function scr_drawChunks(){
 			if (!obj_control.hideChunks || ds_list_size(currentChunkInChainsList) >= 1) {
 				draw_set_color(colorOfRect);
 				draw_set_alpha(1);
-				scr_drawRectWidth(chunkRectX1, chunkRectY1, chunkRectX2, chunkRectY2, 3, (typeOfChain == "trail"));
+				scr_drawRectWidth(chunkRectX1, chunkRectY1, chunkRectX2, chunkRectY2, chunkInFocusedChain ? 4 : 3, (typeOfChain == "trail"));
 			}
 
 			// if this chunk is focused, fill it in and draw the focused sqaures
-			if (obj_chain.currentFocusedChunkID == currentChunkID || chunkInFocusedChain) {
-				draw_set_color((obj_chain.mouseLineWordID == currentChunkID || obj_chain.mouseLineWordID ==  scr_getFirstWordOfChunk(currentChunkID)) ? colorOfRect : global.colorThemeSelected1);
+			if (obj_chain.currentFocusedChunkID == currentChunkID || obj_chain.mouseLineWordID == currentChunkID || obj_chain.mouseLineWordID == scr_getFirstWordOfChunk(currentChunkID)) {
+				draw_set_color(colorOfRect);
 				draw_set_alpha(.5);
-				draw_rectangle(chunkRectX1, chunkRectY1, chunkRectX2, chunkRectY2, false);			
-
-				var fontScale = 1;
-			    draw_sprite_ext(spr_focusPoint, 0, chunkRectX1 - obj_control.wordDrawGridFocusedAnimation, chunkRectY1 - obj_control.wordDrawGridFocusedAnimation, fontScale, fontScale, 0, colorOfRect, 1);
-			    draw_sprite_ext(spr_focusPoint, 0, chunkRectX2 + obj_control.wordDrawGridFocusedAnimation, chunkRectY1 - obj_control.wordDrawGridFocusedAnimation, fontScale, fontScale, 0, colorOfRect, 1);
-			    draw_sprite_ext(spr_focusPoint, 0, chunkRectX1 - obj_control.wordDrawGridFocusedAnimation, chunkRectY2 + obj_control.wordDrawGridFocusedAnimation, fontScale, fontScale, 0, colorOfRect, 1);
-			    draw_sprite_ext(spr_focusPoint, 0, chunkRectX2 + obj_control.wordDrawGridFocusedAnimation, chunkRectY2 + obj_control.wordDrawGridFocusedAnimation, fontScale, fontScale, 0, colorOfRect, 1);	    
+				if((typeOfChain == "trail")){
+					draw_roundrect(chunkRectX1, chunkRectY1, chunkRectX2, chunkRectY2, false);	
+				}
+				else{
+					draw_rectangle(chunkRectX1, chunkRectY1, chunkRectX2, chunkRectY2, false);	
+				}
 			}
 		}
 	}
@@ -229,6 +228,13 @@ function scr_drawChunks(){
 		// click on chunk
 		if (device_mouse_check_button_released(0, mb_left) and !(global.delayInput > 0)and !instance_exists(obj_dropDown)) {
 
+
+			if (global.ctrlHold) {
+				// combine chains
+				var inChainsList = currentChunkSubMap[?"inChainsList"];
+				scr_combineChainsDrawLine(inChainsList);
+			}
+
 			// focus chunk in panelPane
 			with (obj_panelPane) {
 				functionChainList_chunkSelected = obj_control.hoverChunkID;
@@ -335,6 +341,9 @@ function scr_drawChunks(){
 					scr_refocusChainEntry(obj_control.hoverChunkID);
 				}
 			}
+
+
+
 		}
 
 		// Check for rightMouseClick
@@ -370,7 +379,12 @@ function scr_drawChunks(){
 				draw_set_color(global.colorThemeSelected1);
 				draw_set_alpha(.5);
 				if (is_numeric(highlightChunkX1) && is_numeric(highlightChunkY1) && is_numeric(highlightChunkX2) && is_numeric(highlightChunkY2)) {
-					draw_rectangle(highlightChunkX1, highlightChunkY1, highlightChunkX2, highlightChunkY2, false);
+					if((typeOfChain == "trail")){
+						draw_roundrect(highlightChunkX1, highlightChunkY1, highlightChunkX2, highlightChunkY2, false);	
+					}
+					else{
+						draw_rectangle(highlightChunkX1, highlightChunkY1, highlightChunkX2, highlightChunkY2, false);	
+					}
 				}
 			}
 		}

diff --git a/Rezonator/scripts/scr_drawCurvedLine/scr_drawCurvedLine.gml b/Rezonator/scripts/scr_drawCurvedLine/scr_drawCurvedLine.gml
@@ -1,15 +1,4 @@
-/*
-	scr_drawCurvedLine(x1, y1, x2, y2);
-	
-	Last Updated: 2018-07-12
-	
-	Called from: obj_chain
-	
-	Purpose: draw curved line between given points (for trackChains)
-	
-	Mechanism: create several tiny lines to draw that form a curve in between the two points
-*/
-function scr_drawCurvedLine(x1, y1, x2, y2, color) {
+function scr_drawCurvedLine(x1, y1, x2, y2, color, width) {
 
 	draw_set_color(color);
 	draw_set_alpha(1);
@@ -46,7 +35,7 @@ function scr_drawCurvedLine(x1, y1, x2, y2, color) {
 	        var Qyy = (Qy2 - Qy1) * (new_pr) + Qy1;
 
 
-	        draw_line_width(QX, QY, Qxx, Qyy, 2);
+	        draw_line_width(QX, QY, Qxx, Qyy, width);
 
 	    }
 
@@ -83,7 +72,7 @@ function scr_drawCurvedLine(x1, y1, x2, y2, color) {
 			var Qxx_2 = (Qx2_2 - Qx1_2) * (new_pr_2) + Qx1_2;
 			var Qyy_2 = (Qy2_2 - Qy1_2) * (new_pr_2) + Qy1_2;
 
-			draw_line_width(QX_2, QY_2, Qxx_2, Qyy_2, 2);
+			draw_line_width(QX_2, QY_2, Qxx_2, Qyy_2, width);
 
 	    }
 	}

diff --git a/Rezonator/scripts/scr_drawCurvedLine/scr_drawCurvedLine.yy.new b/Rezonator/scripts/scr_drawCurvedLine/scr_drawCurvedLine.yy.new
diff --git a/Rezonator/scripts/scr_drawLineEntryList/scr_drawLineEntryList.gml b/Rezonator/scripts/scr_drawLineEntryList/scr_drawLineEntryList.gml
@@ -132,7 +132,7 @@ function scr_drawLineEntryList(unitID, unitSubMap, entryList, pixelY, OOBCheck){
 			// get this token's inChainsList, and update the chainShowList accordingly
 			var inChainsList = currentTokenSubMap[?"inChainsList"];
 			var inEntryList = currentTokenSubMap[?"inEntryList"];
-			scr_updateChainShowList(inChainsList, inEntryList, obj_chain.chainShowList, currentTokenSubMap[?"inChunkList"], currentToken, tokenRectX1, tokenRectY1, tokenRectX2, tokenRectY2);	
+			scr_updateChainShowList(inChainsList, inEntryList, obj_chain.chainShowList, currentTokenSubMap[?"inChunkList"], currentToken, tokenRectX1, tokenRectY1, tokenRectX2, tokenRectY2, mouseOverToken);	
 
 			var drawTokenBorder = false;
 			if (rightClickID == currentToken) {
@@ -150,6 +150,7 @@ function scr_drawLineEntryList(unitID, unitSubMap, entryList, pixelY, OOBCheck){
 				if (sizeOfInChainsList == 0) {
 					drawTokenBorder = true;
 				}
+
 				obj_control.hoverTokenID = currentToken;
 				var tokenTagMap = currentTokenSubMap[?"tagMap"];
 				obj_control.hoverTextCopy = tokenTagMap[? global.displayTokenField];
@@ -186,18 +187,15 @@ function scr_drawLineEntryList(unitID, unitSubMap, entryList, pixelY, OOBCheck){
 					}
 
 				}
-
-				//if (keyboard_check_released(ord("N"))) {
-				//	if (ds_list_size(inChainsList) > 0) {
-				//		scr_alignChain2ElectricBoogaloo(inChainsList[| 0]);
-				//	}
-				//}
+
 			}
-
+
+
 			if (drawTokenBorder) {
 				draw_set_color(global.colorThemeBorders);
 				draw_rectangle(tokenRectX1,tokenRectY1,tokenRectX2,tokenRectY2, true);
 			}
+
 
 
 			// draw the token's text

diff --git a/Rezonator/scripts/scr_gridViewDrawBackArrow/scr_gridViewDrawBackArrow.gml b/Rezonator/scripts/scr_gridViewDrawBackArrow/scr_gridViewDrawBackArrow.gml
@@ -43,14 +43,14 @@ function scr_gridViewDrawBackArrow() {
 				obj_control.gridView = false;
 			}
 
-			if (obj_control.searchGridActive || obj_control.filterGridActive) {
+			if (obj_control.searchGridActive || obj_control.filterGridActive || obj_control.quickFilterGridActive) {
 				scr_disableFilter();
 			}
 		}
 
 		var tooltipText = "";
 		if (obj_control.gridView) tooltipText = scr_get_translation("label_back");
-		else if (obj_control.searchGridActive || obj_control.filterGridActive) tooltipText = scr_get_translation("menu_clear");
+		else tooltipText = scr_get_translation("menu_clear");
 		scr_createTooltip(backArrowRectX2, mean(backArrowRectY1, backArrowRectY2), tooltipText, obj_tooltip.arrowFaceLeft);
 	}
 

diff --git a/Rezonator/scripts/scr_helpOptions/scr_helpOptions.gml b/Rezonator/scripts/scr_helpOptions/scr_helpOptions.gml
@@ -7,7 +7,7 @@ function scr_helpOptions(optionSelected) {
 			obj_panelPane.functionHelp_collapsed = !obj_panelPane.functionHelp_collapsed;
 			break;
 		case "menu_guide":// hide/show rez chains
-			url_open("http://rezonator.com/documentation/");
+			url_open("https://johnwdubois.github.io/rezonator/");
 			break;
 		case "menu_about":// hide/show stack chains
 			url_open("http://rezonator.com/");

diff --git a/Rezonator/scripts/scr_openingMenu/scr_openingMenu.gml b/Rezonator/scripts/scr_openingMenu/scr_openingMenu.gml
@@ -117,7 +117,7 @@ function scr_openingMenu() {
 
 	if (mouseoverDocumenation && documentationButtonActive) {
 		if(mouse_check_button_released(mb_left)){
-			url_open("https://rezonator.com/documentation/");
+			url_open("https://johnwdubois.github.io/rezonator/");
 		}
 	}
 

diff --git a/Rezonator/scripts/scr_updateChainShowList/scr_updateChainShowList.gml b/Rezonator/scripts/scr_updateChainShowList/scr_updateChainShowList.gml
@@ -1,6 +1,6 @@
 // Script assets have changed for v2.3.0 see
 // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information
-function scr_updateChainShowList(inChainsList, inEntryList, chainShowList, inBoxList,tokenID,rectX1,rectY1,rectX2,rectY2){
+function scr_updateChainShowList(inChainsList, inEntryList, chainShowList, inBoxList,tokenID,rectX1,rectY1,rectX2,rectY2, mouseOverToken){
 
 	// get size of inChainsList
 	var inChainsListSize = 0;
@@ -52,12 +52,18 @@ function scr_updateChainShowList(inChainsList, inEntryList, chainShowList, inBox
 				else if (chainType == "trail") draw_roundrect(rectX1, rectY1, rectX2, rectY2, false);
 				draw_set_alpha(1);
 			}
+			else if (mouseOverToken) {
+				draw_set_color(merge_color(global.colorThemeSelected1, global.colorThemeBG, 0.5));
+				if (chainType == "resonance") draw_rectangle(rectX1, rectY1, rectX2, rectY2, false);
+				else if (chainType == "trail") draw_roundrect(rectX1, rectY1, rectX2, rectY2, false);
+			}
+
 
 			// draw border around token if its in a chain
 			if (chainVisible) {
 				draw_set_color(chainColor);
 				draw_set_alpha(1);
-				scr_drawRectWidth(rectX1, rectY1, rectX2, rectY2, 2, chainType == "trail");
+				scr_drawRectWidth(rectX1, rectY1, rectX2, rectY2, (obj_chain.currentFocusedChainID == currentChain) ? 3 : 2, chainType == "trail");
 			}
 
 

diff --git a/Steam page/.DS_Store b/Steam page/.DS_Store
diff --git a/Steam page/Adobe After Effects Auto-Save/Steam trailer auto-save 3.aep b/Steam page/Adobe After Effects Auto-Save/Steam trailer auto-save 3.aep
diff --git a/Steam page/Adobe After Effects Auto-Save/Steam trailer auto-save 4.aep b/Steam page/Adobe After Effects Auto-Save/Steam trailer auto-save 4.aep
diff --git a/Steam page/Adobe After Effects Auto-Save/Steam trailer auto-save 5.aep b/Steam page/Adobe After Effects Auto-Save/Steam trailer auto-save 5.aep
diff --git a/Steam page/Adobe After Effects Auto-Save/Steam trailer auto-save 6.aep b/Steam page/Adobe After Effects Auto-Save/Steam trailer auto-save 6.aep
diff --git a/Steam page/Adobe After Effects Auto-Save/Steam trailer auto-save 7.aep b/Steam page/Adobe After Effects Auto-Save/Steam trailer auto-save 7.aep
diff --git a/Steam page/Library Hero.png b/Steam page/Library Hero.png
diff --git a/Steam page/Library Hero.psd b/Steam page/Library Hero.psd
diff --git a/Steam page/Library Logo 2.png b/Steam page/Library Logo 2.png
diff --git a/Steam page/Library Logo 3.png b/Steam page/Library Logo 3.png
diff --git a/Steam page/Library hero adjust.png b/Steam page/Library hero adjust.png
diff --git a/Steam page/Steam trailer.aep b/Steam page/Steam trailer.aep
diff --git a/Steam page/Steam trailer_AME/.DS_Store b/Steam page/Steam trailer_AME/.DS_Store
diff --git a/Steam page/Steam trailer_AME/Rez trailer draft 1.mp4 b/Steam page/Steam trailer_AME/Rez trailer draft 1.mp4
diff --git a/Steam page/Steam trailer_AME/Rez trailer draft 2.mp4 b/Steam page/Steam trailer_AME/Rez trailer draft 2.mp4
diff --git a/Steam page/Steam trailer_AME/Rez trailer draft 3.mp4 b/Steam page/Steam trailer_AME/Rez trailer draft 3.mp4
diff --git a/Steam page/Steam trailer_AME/tmpAEtoAMEProject-Rez trailer.aep b/Steam page/Steam trailer_AME/tmpAEtoAMEProject-Rez trailer.aep
diff --git a/Steam page/Steam trailer_AME/tmpAEtoAMEProject-Rez trailer_1.aep b/Steam page/Steam trailer_AME/tmpAEtoAMEProject-Rez trailer_1.aep
diff --git a/Steam page/Steam trailer_AME/tmpAEtoAMEProject-Rez trailer_2.aep b/Steam page/Steam trailer_AME/tmpAEtoAMEProject-Rez trailer_2.aep
diff --git a/Steam page/Steam trailer_AME/tmpAEtoAMEProject-Rez trailer_3.aep b/Steam page/Steam trailer_AME/tmpAEtoAMEProject-Rez trailer_3.aep