mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-13 20:25:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into d/pal-pass

Browse Source
This commit is contained in:
ManDude
2022-06-22 01:59:52 +01:00
parent 617f2c6f33 78b6ba3d27
commit d837b05453
132 changed files with 20835 additions and 10032 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goal_src/engine/ui/progress/progress.gc
+2 -2
View File
@@ -701,9 +701,9 @@
(let ((f0-1 (* (1/ METER_LENGTH) (the float (-> obj in-out-position)))))
(set! (-> obj particles 2 init-pos x) (the float (+ (-> obj right-x-offset) 409 (the int (* 301.5 f0-1)))))
(set! (-> obj particles 1 init-pos x) (the float (+ (-> obj left-x-offset) 59)))
(set! (-> obj left-side-x-scale) (meters (+ (/ 3.5 (-> obj sides-x-scale)) (* 10.0 f0-1))))
(set! (-> obj left-side-x-scale) (meters (+ (/ (if (= (-> *pc-settings* aspect-custom-x) 16) 5.0 3.5) (-> obj sides-x-scale)) (* 10.0 f0-1))))
(set! (-> obj left-side-y-scale) (meters (+ (-> obj sides-y-scale) (* 10.0 f0-1))))
(set! (-> obj right-side-x-scale) (meters (+ (/ 6.0 (-> obj sides-x-scale)) (* 4.0 f0-1))))
(set! (-> obj right-side-x-scale) (meters (+ (/ (if (= (-> *pc-settings* aspect-custom-x) 16) 8.5 6.0) (-> obj sides-x-scale)) (* 4.0 f0-1))))
(set! (-> obj right-side-y-scale) (meters (+ (-> obj sides-y-scale) (* 4.0 f0-1))))
)
(dotimes (s5-0 (-> obj nb-of-particles))