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

first RC build.

Browse Source
This commit is contained in:
Bryce Covert
2017-05-31 22:01:35 -07:00
parent 9825eba3ae
commit 9003ca0bdf
5 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/gametodos.txt
View File

@@ -1,7 +1,5 @@
MOBILE MOBILE
Desktop buttons are wrong size Desktop buttons are wrong size
background loading of assets?
loading image? loading image?
reset inventory text on open up

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

@@ -22,12 +22,6 @@
[java.io FileOutputStream File PrintStream]) [java.io FileOutputStream File PrintStream])
) )
(defn g []
(log/info "ABC"))
(defn a []
(g))
(defonce am (asset-manager)) (defonce am (asset-manager))
(set-asset-manager! am) (set-asset-manager! am)

3
desktop/src-common/advent/screens/scene.clj
View File

@@ -1217,7 +1217,7 @@
:inside-antique (wrap rooms.inside-antique/make "packed/inside-antique.atlas") :inside-antique (wrap rooms.inside-antique/make "packed/inside-antique.atlas")
:inside-jail (wrap rooms.inside-jail/make "packed/inside-jail.atlas") :inside-jail (wrap rooms.inside-jail/make "packed/inside-jail.atlas")
:dream (wrap rooms.dream/make "packed/dream.atlas") :dream (wrap rooms.dream/make "packed/dream.atlas")
:ending (wrap rooms.ending/make "packed/ending.atlas") :ending (wrap rooms.ending/make "packed/ending-castle.atlas")
:castle-gate (wrap rooms.castle-gate/make "packed/castle-gate.atlas") :castle-gate (wrap rooms.castle-gate/make "packed/castle-gate.atlas")
:outside-jail (wrap rooms.outside-jail/make "packed/outside-jail.atlas") :outside-jail (wrap rooms.outside-jail/make "packed/outside-jail.atlas")
:outside-castle (wrap rooms.outside-castle/make "packed/outside-castle.atlas") } :outside-castle (wrap rooms.outside-castle/make "packed/outside-castle.atlas") }
@@ -1357,7 +1357,6 @@
:on-pinch :on-pinch
(fn [screen entities {:keys [initial-pointer-1 initial-pointer-2 pointer-1 pointer-2]}] (fn [screen entities {:keys [initial-pointer-1 initial-pointer-2 pointer-1 pointer-2]}]
(log/info "pinching...")
(when (get-in entities [:state :active?]) (when (get-in entities [:state :active?])
(let [start-zoom (get-in entities [:cam :start-zoom]) (let [start-zoom (get-in entities [:cam :start-zoom])
zoom (get-in entities [:cam :zoom]) zoom (get-in entities [:cam :zoom])

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

@@ -369,6 +369,7 @@
(fn [screen entities options] (fn [screen entities options]
(let [[screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas") (let [[screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas")
[screen title-atlas] (utils/acquire-atlas screen "packed/title.atlas") [screen title-atlas] (utils/acquire-atlas screen "packed/title.atlas")
_ (update! screen :texture-atlas title-atlas)
screen (utils/setup-viewport screen 1280 960)] screen (utils/setup-viewport screen 1280 960)]
(log/info "Starting title screen.") (log/info "Starting title screen.")
@@ -569,7 +570,7 @@
(utils/remove-save (:id (:selected-save entities))) (utils/remove-save (:id (:selected-save entities)))
(as-> entities entities (as-> entities entities
(utils/remove-actor-from-stage entities :confirm-delete) (utils/remove-actor-from-stage entities :confirm-delete)
(assoc entities :saves-list (utils/snapshot-screenshots (-> screen :resources :default second))) (assoc entities :saves-list (utils/snapshot-screenshots (-> screen :texture-atlas)))
(assoc entities :save-menu (->> (saves-menu entities (:renderer screen)) (assoc entities :save-menu (->> (saves-menu entities (:renderer screen))
(utils/add-actor-to-stage screen))))) (utils/add-actor-to-stage screen)))))

4
ios/Info.plist.xml
View File

@@ -21,7 +21,7 @@
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>119</string> <string>121</string>
<key>MinimumOSVersion</key> <key>MinimumOSVersion</key>
<string>8.0</string> <string>8.0</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
@@ -35,6 +35,8 @@
<string>{320,568}</string> <string>{320,568}</string>
<key>UILauunchImages</key> <key>UILauunchImages</key>
<array> <array>
<string>Default</string>
<string>Default@2x</string>
<string>Default-568h</string> <string>Default-568h</string>
<string>Default-568h@2x</string> <string>Default-568h@2x</string>
<string>Default-Portrait~ipad</string> <string>Default-Portrait~ipad</string>