notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hopefully, hopefully, the last of font issues. used magic wand, expand 8px, fill with black. mono for no AA.

Browse Source
This commit is contained in:
Bryce Covert
2016-04-21 20:49:05 -07:00
parent 93f47dd2fe
commit 0acdf0171d
11 changed files with 213 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
desktop/src-common/advent/core.clj
View File

@@ -26,7 +26,8 @@
(defgame advent
:on-create
(fn [this]
(clojure.tools.logging/log-capture! *ns* :warn :error)
(log/log-capture! *ns* :warn :error)
(log/info "Starting game on version v" (advent.version/version))
(steam/init)
(set-screen! this splash/splash-screen)))

8
desktop/src-common/advent/screens/credits.clj
View File

@@ -35,7 +35,7 @@
"Scott Steinburg"]]
[:pos ["QA"
"Dane Tippman"
"Henri Hanninen"
"Henri Hänninen"
"David Goodin"]
["QA Lead"
"Wayne Sung"]
@@ -100,8 +100,8 @@
(fn [people-rows person-name]
(-> people-rows
(conj :row)
(conj (label person-name (get-person-style entities 1.0) :set-alignment Align/center))))
[(label (doto role) (get-role-style entities 1.0) :set-alignment Align/center)]
(conj (label person-name (get-person-style entities 1.0) :set-alignment Align/center :set-font-scale 0.25))))
[(label (doto role) (get-role-style entities 1.0) :set-alignment Align/center :set-font-scale 0.25)]
persons))
:top :width 350 :pad-right 30 :pad-left 30])))
[]
@@ -195,7 +195,7 @@
(.apply viewport)
(let [entities (utils/apply-tweens screen entities (:tweens entities))
entities (start-message-if-necessary screen entities)]
(clear!)
(render! screen [(:bg entities) (:credit-table entities) (:fade entities) (:dbh entities) (:pos entities)])
entities))

10
desktop/src-common/advent/screens/dialogue.clj
View File

@@ -61,9 +61,9 @@
_ (bitmap-font! font :set-markup-enabled true)
tr (bitmap-font! font :get-region)
scale (/ scale 2)
scale (or (min (max scale 0.4) 0.5) 0.5)
scale (or (min (max scale 0.2) 0.25) 0.25)
tx (.getTexture tr)
_ (texture! tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear)
_ (texture! tx :set-filter Texture$TextureFilter/Nearest Texture$TextureFilter/Nearest)
style (style :label font color)
#_#__ (set! (.background style) bg)
[source-x source-y] [x y]
@@ -129,7 +129,7 @@
tx (.getTexture tr)
p (NinePatchEntity. (skin! (skin "ui/ui.json") :get-patch "ui-bg"))
_ (nine-patch! p :set-padding 25 25 5 15)
_ (texture! tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear)]
_ (texture! tx :set-filter Texture$TextureFilter/Nearest Texture$TextureFilter/Nearest)]
{:state {:object nil
:callback nil
:choices []
@@ -159,7 +159,7 @@
(label! :set-x (:x e))
(label! :set-y (:y e))
(label! :set-height (:height e))
(label! :set-font-scale 0.5))]))
(label! :set-font-scale 0.25))]))
(assoc-in [:state :choices] choices)
(assoc-in [:state :callback] callback)
(assoc-in [:state :np :height] (* choice-height (inc choice-count))))))
@@ -216,7 +216,7 @@
style (style :label font (color :red))
[x y] [(/ 1280 2) (/ 960 2)]
talk (label message style :set-alignment Align/center :set-font-scale 0.5)
talk (label message style :set-alignment Align/center :set-font-scale 0.25)
x (- x (/ (label! talk :get-width) 2))
talk (assoc talk :x x :y y :opacity 1.0)
talk (ensure-on-screen talk)]

10
desktop/src-common/advent/screens/title.clj
View File

@@ -161,7 +161,7 @@
(let [s (skin! (skin "ui/ui.json") :get CheckBox$CheckBoxStyle)]
(-> s
.font
(.setScale 0.5 0.5))
(.setScale 0.25 0.25))
(doto (merge (check-box msg s)
(apply hash-map rest))
@@ -184,7 +184,7 @@
(label style)
(assoc :x 0 :y 0 :height 40 :origin-x 0 :origin-y 0 :z 8)
(doto (label! :set-alignment Align/bottom)
#_(label! :set-font-scale 0.5)
(label! :set-font-scale 0.25)
#_(#(label! % :set-width (/ (label! % :get-width) 2))))
center))))
@@ -291,7 +291,7 @@
(.setOrigin (/ (- cell-w 16) 2) (/ (- cell-h 16) 2))
(.addActor (:object (doto (image (texture screenshot))
(image! :set-size (- cell-w 16) (- cell-h 16)))))
(.addActor (:object (make-label (str " " (or blurb name)) label-color )))
(.addActor (:object (make-label (str "" (or blurb name)) label-color )))
))
@@ -401,7 +401,7 @@
:font font
:music music
:volume 1.0
:copyright (make-label (str "Copyright Digital Bounce House 2016" (advent.version/version)) label-color)
:copyright (make-label (str "© Digital Bounce House 2016 - v" (advent.version/version)) label-color)
:tweens {:fade-in (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 1.0
:finish #(do
@@ -445,8 +445,6 @@
(when-not (get-in entities [:tweens :fade-out])
(let [e (-> actor .getUserObject)
actor-key (:key e)]
(println e)
(cond (= :music-volume-slider actor-key)
(do (swap! utils/settings assoc :music-volume (slider! e :get-value))
(utils/save-settings!)