projects
/
starship-fights
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aedecbf
)
Client-side changes
author
TheSaminator
<TheSaminator@users.noreply.github.com>
Thu, 10 Feb 2022 16:00:19 +0000
(11:00 -0500)
committer
TheSaminator
<TheSaminator@users.noreply.github.com>
Thu, 10 Feb 2022 16:00:19 +0000
(11:00 -0500)
src/jsMain/kotlin/starshipfights/game/game_resources.kt
patch
|
blob
|
history
src/jsMain/kotlin/starshipfights/game/popup.kt
patch
|
blob
|
history
src/jsMain/resources/textures/grid-tile.png
patch
|
blob
|
history
diff --git
a/src/jsMain/kotlin/starshipfights/game/game_resources.kt
b/src/jsMain/kotlin/starshipfights/game/game_resources.kt
index da24228e6640a07eefb4319f78a26dadfb910bb7..1be28ee16835503c283bd03fb45de374e96da4c8 100644
(file)
--- a/
src/jsMain/kotlin/starshipfights/game/game_resources.kt
+++ b/
src/jsMain/kotlin/starshipfights/game/game_resources.kt
@@
-120,8
+120,14
@@
object RenderResources {
val material = MeshBasicMaterial(configure {
map = gridTex
- alphaTest = 0.5
+
side = DoubleSide
+ depthWrite = false
+
+ blending = CustomBlending
+ blendEquation = AddEquation
+ blendSrc = OneFactor
+ blendDst = OneMinusSrcColorFactor
})
val plane = PlaneGeometry(w3d, l3d)
diff --git
a/src/jsMain/kotlin/starshipfights/game/popup.kt
b/src/jsMain/kotlin/starshipfights/game/popup.kt
index 336c6aba87c6c933961e1556f4ff3b8f43643998..cfe1a4318cd2e1dbbbe30a7610a4e6cdcd46979a 100644
(file)
--- a/
src/jsMain/kotlin/starshipfights/game/popup.kt
+++ b/
src/jsMain/kotlin/starshipfights/game/popup.kt
@@
-445,6
+445,13
@@
sealed class Popup<out T> {
+outcome
}
+ p {
+ style = "text-align:center"
+
+ a(href = "/me") {
+ +"Return to Home Page"
+ }
+ }
}
}
}
diff --git
a/src/jsMain/resources/textures/grid-tile.png
b/src/jsMain/resources/textures/grid-tile.png
index 6ae3a3d94b241bd3ca19b589aca1c50723d11afd..be1cd425dbf45ae1c81067279151e57a8c0d1022 100644
(file)
Binary files a/src/jsMain/resources/textures/grid-tile.png and b/src/jsMain/resources/textures/grid-tile.png differ