Merge pull request #26 from boltgolt/dev

Version 0.2.0
boltgolt · Oct 20, 2019 · 122ff56 · 122ff56
2 parents ca36d6b + d377088
commit 122ff56
Show file tree

Hide file tree

Showing 28 changed files with 1,130 additions and 465 deletions.
diff --git a/README.md b/README.md
@@ -8,21 +8,6 @@
 
 ## Features
 
-### Advisories
-
-Advisories are automatically detected events that the observer might want to switch to.
-To make switching to this event easier, the observer slot number is displayed next to an icon noting the type of advisory.
-The observer should still make his own judgment of the situation.
-
-All possible advisories are (with increasing priority):
-
-| Advisory                               | Type          | Description                                                                                                                    |
-|----------------------------------------|---------------|--------------------------------------------------------------------------------------------------------------------------------|
-| ![](https://i.imgur.com/xR9eknI.png)   | Default       | This is displayed when no other events are happening.                                                                          |
-| ![](https://i.imgur.com/FCZ8oB0.png)   | Sole survivor | Only one member of a team is left standing. It's a good idea to observe this player, as all action will involve him.           |
-| ![](https://i.imgur.com/DD2El5N.png)   | Bomb plant    | A terrorist has the bomb in his hands on a bombsite. Chances are that he'll plant it soon.                                     |
-| ![](https://i.imgur.com/Xy1oLON.png)   | Defusing      | A CT is defusing the bomb. Because of a CSGO limitation, which CT is defusing is unclear if multiple CTs are on the bomb site. |
-
 ### Advanced player dots
 
 Just like in the default CSGO radar, players are represented as dots. Every dot has its observer slot number on top of it.
@@ -32,7 +17,6 @@ The type of dots displayed by Boltobserv:
 | Dot                                    | Type              | Description                                                                                                          |
 |----------------------------------------|-------------------|----------------------------------------------------------------------------------------------------------------------|
 | ![](https://i.imgur.com/TfzvrAS.png)   | Default           | Player dots as seen on the normal CSGO radar, normally with a slot number on them.                                   |
-| ![](https://i.imgur.com/4uuaPvv.png)   | Grenade equipped  | These players have any kind of grenade in their hands. Very useful for spotting nade setups on the radar.            |
 | ![](https://i.imgur.com/dEDwuue.png)   | Dead              | Killed players are still faintly visible on the radar as a small cross.                                              |
 | ![](https://i.imgur.com/AT9Ee6y.png)   | Bomb carrier      | For Ts only. Shows the player that has the C4 with them. Easily spottable on the radar because of the color difference.   |
 
@@ -43,11 +27,37 @@ They're also much easier on the eyes.
 
 ![](https://i.imgur.com/Pvfi8vx.png)
 
+### Advisories
+
+Advisories are automatically detected events that the observer might want to switch to.
+To make switching to this event easier, the observer slot number is displayed next to an icon noting the type of advisory.
+The observer should still make his own judgment of the situation.
+
+All possible advisories are (with increasing priority):
+
+| Advisory                               | Type          | Description                                                                                                                    |
+|----------------------------------------|---------------|--------------------------------------------------------------------------------------------------------------------------------|
+| ![](https://i.imgur.com/xR9eknI.png)   | Default       | This is displayed when no other events are happening.                                                                          |
+| ![](https://i.imgur.com/FCZ8oB0.png)   | Sole survivor | Only one member of a team is left standing. It's a good idea to observe this player, as all action will involve him.           |
+| ![](https://i.imgur.com/DD2El5N.png)   | Bomb plant    | A terrorist has the bomb in his hands on a bombsite. Chances are that he'll plant it soon.                                     |
+| ![](https://i.imgur.com/Xy1oLON.png)   | Defusing      | A CT is defusing the bomb. Because of a CSGO limitation, which CT is defusing is unclear if multiple CTs are on the bomb site. |
+
 ### Infinitely scalable
 
 Because Boltobserv runs as an external application, it can be resized to be whatever size you want, and be moved to any display you want.
 Running without window borders enables it to dedicate as much space as possible to the radar.
 
+It can even [run in a browser](https://github.com/boltgolt/boltobserv/wiki/Opening-radar-in-browser), allowing you to view the radar over the network.
+
+### And more
+
+ - Smokes and molotovs
+ - Split maps (nuke & vertigo)
+ - Automatic zoom
+ - Transparent radar background
+ - Etc.
+
+
 ## Installation
 
 1. Download the latest .zip form the [releases](https://github.com/boltgolt/boltobserv/releases) page and unzip it.

diff --git a/config.json5 b/config.json5
@@ -6,7 +6,8 @@
 {
 	// Sends information about the grenades thrown this round to a server
 	// This information in only used to train a model to predict grenade
-	// landings, no personal information is send or logged
+	// landings, no personal information is send or logged.
+	// https://github.com/boltgolt/boltobserv/wiki/FAQ:-Automatically-collecting-grenade-data-from-Boltobserv
 	"nadeCollection": true,
 
 	// Settings related to the Boltobserv window
@@ -19,7 +20,7 @@
 
 		// Start window as a full screen application
 		// Use ALT + F4 to quit
-		"fullscreen": true,
+		"fullscreen": false,
 
 		// Will disable GPU rendering, helps capture the window in programs like OBS
 		"disableGpu": false,
@@ -41,6 +42,16 @@
 		}
 	},
 
+	// Settings related to remote browser access to the radar
+	"browser": {
+		"ports": {
+			// Serves static files, such as HTML. Use this one in your browser
+			"static": 36364,
+			// Dynamic websocket port, used for live data transport
+			"socket": 36365
+		}
+	},
+
 	// Settings that will change the way the radar will be displayed
 	"radar": {
 		// Hide advisories on the radar
@@ -75,14 +86,15 @@
 		"smoothing": 32,
 
 		// Percentage of radar space to try to keep as padding between the outermost players and the edge of the radar
-		"padding": 0.3
+		"padding": 0.3,
+
+		// Only apply autozoom if calculated zoom level would be at least this much
+		// In decimals, where 1.2 would mean 20% more zoomed in than the default radar
+		"minZoom": 1.3
 	},
 
 	// Settings that should not be used in normal operation, but help to find issues
 	"debug": {
-		// Draw red squares over bombsite locations
-		"drawBombsites": false,
-
 		// Print the loaded config into the console
 		"printConfig": false
 	}

diff --git a/style/main.css → css/main.css b/style/main.css → css/main.css
@@ -4,6 +4,7 @@ body {
 	align-items: center;
 	justify-content: center;
 	font-family: Arial, Helvetica, sans-serif;
+	-moz-user-select: none;
 	user-select: none;
 	cursor: not-allowed;
 }

diff --git a/style/map.css → css/map.css b/style/map.css → css/map.css
@@ -44,7 +44,7 @@ body {
 	transition: opacity 1.8s;
 }
 
-#infernos{
+#infernos {
 	position: absolute;
 	height: 100%;
 	width: 100%;
@@ -53,7 +53,7 @@ body {
 	z-index: 2;
 }
 
-.inferno{
+.inferno {
 	position: absolute;
 	height: 100%;
 	width: 100%;
@@ -63,13 +63,13 @@ body {
 	transition: opacity .3s;
 }
 
-.inferno > div{
+.inferno > div {
 	position: absolute;
 	border-radius: 100%;
 	opacity: .75;
 	background: #ff4848;
 	box-sizing: border-box;
-	border: #ce3f00 solid 1.5px;
+	border: #ce3f00 solid 3px;
 	transform: translate(-50%, -50%);
 	transition: opacity .3s;
 }

diff --git a/style/waiting.css → css/waiting.css b/style/waiting.css → css/waiting.css
@@ -77,14 +77,32 @@ body {
 
 img {
 	height: 20vmin;
-	padding-bottom: 5vmin;
+	animation: beat 2s infinite ease-in-out;
+}
+
+@keyframes beat {
+	40% {
+		transform: rotate(0deg);
+	}
+
+	60% {
+		transform: rotate(190deg);
+	}
+
+	70% {
+		transform: rotate(180deg);
+	}
+
+	100% {
+		transform: rotate(180deg);
+	}
 }
 
 #noconnection {
 	font-size: 4vmin;
 	text-align: center;
 	box-sizing: border-box;
-	padding: 0 10vmin 5vmin 10vmin;
+	padding: 5vmin 10vmin 5vmin 10vmin;
 }
 
 #version {
@@ -93,17 +111,17 @@ img {
 	text-align: center;
 	color: #636363;
 	bottom: 3vmin;
-	font-size: 1.6vmin;
+	font-size: 11px;
 	text-transform: uppercase;
 }
 
 #version small {
 	font-size: inherit;
 	color: #7E7E7E;
+	text-decoration: underline;
 }
 
 #version small:hover {
-	text-decoration: underline;
 	cursor: pointer;
 	position: relative;
 	z-index: 2000;
@@ -114,3 +132,9 @@ img {
 	max-width: initial;
 	max-height: initial;
 }
+
+@media (min-height: 800px) and (min-width: 800px) {
+	#version {
+		font-size: 1.6vmin;
+	}
+}