 Mashy
|
d54180fc15
|
Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos
|
2019-02-18 14:16:38 +10:00 |
|
|
Mashy
|
1c1ff0cc0d
|
Inventory scene now uses vbox
|
2019-02-18 14:16:23 +10:00 |
|
|
Mashy
|
99cc144361
|
added bound
|
2019-02-17 12:02:32 +10:00 |
|
|
Mashy
|
71d317c985
|
addex vbox scene
|
2019-02-16 20:32:18 +10:00 |
|
|
Mashy
|
08cc37e2b7
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-02-15 16:12:44 +10:00 |
|
|
Mashy
|
e77a948745
|
unfucked 1,2,3 keys
|
2019-02-15 16:12:18 +10:00 |
|
|
Mashy
|
a748e4710b
|
Changed main avatars to vertical + stats
|
2019-02-15 11:51:28 +10:00 |
|
|
Mashy
|
139cf58e5b
|
item list cleanup
|
2019-02-13 13:30:41 +10:00 |
|
|
Mashy
|
400d972aa5
|
Changed inventory to grid and added combiner box for combos
|
2019-02-13 13:11:38 +10:00 |
|
|
Mashy
|
4e0d6cc053
|
change scale mode
|
2019-02-05 10:35:40 +10:00 |
|
|
Mashy
|
cda20d40db
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-02-01 13:35:15 +10:00 |
|
|
Mashy
|
24b7c538c3
|
combos.mod
|
2019-02-01 13:33:59 +10:00 |
|
|
Mashy
|
aefcc5bd32
|
fix for case when player joins game before zones scene loads
|
2019-01-22 17:15:14 +10:00 |
|
|
Mashy
|
d022b27503
|
Hover text in constants
|
2019-01-22 14:47:37 +10:00 |
|
|
Mashy
|
f3d7037abb
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-01-22 14:15:33 +10:00 |
|
|
Mashy
|
68db6e28a2
|
Merge branch 'scaler'
|
2019-01-22 14:15:15 +10:00 |
|
|
Mashy
|
432a7eb6f6
|
Using the 3.16 scale manager
|
2019-01-22 11:44:49 +10:00 |
|
|
Mashy
|
b9ebf89c19
|
Click to forget specs
|
2019-01-17 13:22:49 +10:00 |
|
|
Mashy
|
d833b10ded
|
Added spec display
|
2019-01-16 23:51:12 +10:00 |
|
|
Mashy
|
a9dd2e76cc
|
Moved menu context switching out of main cryps
|
2019-01-16 17:58:15 +10:00 |
|
|
Mashy
|
31f48c0663
|
Placeholder scene for holding specs
|
2019-01-16 16:43:43 +10:00 |
|
|
Mashy
|
2a82404a48
|
Added error handling toasts
|
2019-01-16 13:59:22 +10:00 |
|
|
Mashy
|
f887a6e4ca
|
Simplified navigation, load zone on pve and game list on pvp
|
2019-01-16 12:57:15 +10:00 |
|
|
Mashy
|
a44b9bc929
|
Node types
|
2019-01-15 13:32:41 +10:00 |
|
|
Mashy
|
c6cd0afd15
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-01-15 12:03:07 +10:00 |
|
|
Mashy
|
6b4662dd2f
|
Reduce armour and spellshield bars during combat
|
2019-01-15 12:02:30 +10:00 |
|
|
Mashy
|
cd3f4a83be
|
take zone x&y from server
|
2019-01-14 20:57:58 +10:00 |
|
|
Mashy
|
4c9b8300bc
|
Vertical skill bars
|
2019-01-14 12:26:01 +10:00 |
|
|
Mashy
|
5776b1371f
|
Moved variables into constants file
|
2019-01-14 11:56:20 +10:00 |
|
|
Mashy
|
593a2da7b0
|
Moved stat bar into components
|
2019-01-14 11:45:22 +10:00 |
|
|
Mashy
|
e0660c31a3
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2019-01-13 18:49:40 +10:00 |
|
|
Mashy
|
478906da4f
|
Added bars for defenses
|
2019-01-13 18:40:57 +10:00 |
|
|
Mashy
|
eb9544e4cb
|
New button hpye
|
2019-01-11 18:44:50 +10:00 |
|
|
Mashy
|
4d79f987d3
|
Added glowy box to combat scene as a test 'ok_hand'
|
2019-01-09 14:48:45 +10:00 |
|
|
Mashy
|
19dd5aa87e
|
Center game window
|
2019-01-08 18:53:25 +10:00 |
|
|
Mashy
|
bdd8997141
|
Added block animations, misc ui fixes
|
2019-01-05 12:08:10 +10:00 |
|
|
Mashy
|
2ae764a3a3
|
Added cryp avatar hash and fixed some animations
|
2019-01-04 18:24:01 +10:00 |
|
|
Mashy
|
d9645b7a1d
|
Misc frontend fixes
|
2019-01-03 10:48:26 +10:00 |
|
|
Mashy
|
af29d1c959
|
Merge branch 'menu'
|
2019-01-02 11:38:44 +10:00 |
|
|
Mashy
|
b20b3422a3
|
Statsheet and item request
|
2019-01-02 11:37:32 +10:00 |
|
|
Mashy
|
d31c8775d6
|
new year, new menu
|
2019-01-01 16:15:43 +10:00 |
|
|
Mashy
|
3f208bb29c
|
Remove edge search
|
2018-12-30 15:22:21 +10:00 |
|
|
Mashy
|
d041bcd9bb
|
Rename Missions -> Zones, cleaned up zone classes
|
2018-12-30 15:14:14 +10:00 |
|
|
Mashy
|
c46c74cb7e
|
Merge branch 'zones' of ssh://cryps.gg:40022/~/cryps into zones
|
2018-12-30 14:43:35 +10:00 |
|
|
Mashy
|
119d4d8c9a
|
zone mission update
|
2018-12-30 14:25:22 +10:00 |
|
|
Mashy
|
856a554488
|
gen graph from server data
|
2018-12-28 17:13:13 +10:00 |
|
|
Mashy
|
964447818c
|
Merge branch 'zones'
|
2018-12-28 15:53:29 +10:00 |
|
|
Mashy
|
3527d3faa0
|
Mission UI stuff
|
2018-12-28 15:41:47 +10:00 |
|
|
Mashy
|
b36559ae9f
|
fixed statsheet
|
2018-12-23 23:48:36 +10:00 |
|
|
Mashy
|
e3dd8cfad7
|
fixed some stuff and really basic mission selection
|
2018-12-21 20:53:04 +10:00 |
|
|
Mashy
|
7eceeaf759
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-12-21 19:32:23 +10:00 |
|
|
Mashy
|
58641b57f3
|
refactor menu
|
2018-12-21 19:31:59 +10:00 |
|
|
Mashy
|
f71c8ed8e1
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-12-20 15:11:12 +10:00 |
|
|
Mashy
|
2cac857f2c
|
Trying to join the big leagues
|
2018-12-20 15:10:58 +10:00 |
|
|
Mashy
|
2b1fc76f58
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-12-17 18:02:19 +10:00 |
|
|
Mashy
|
596e9968c0
|
Team animations come from source, skill buttons
|
2018-12-17 18:02:05 +10:00 |
|
|
Mashy
|
f2cf67fa0f
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-12-15 11:30:50 +10:00 |
|
|
Mashy
|
9087b9bebc
|
Atlas and random aztec cryp loading
|
2018-12-15 11:30:22 +10:00 |
|
|
Mashy
|
f78cf7ffff
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-12-14 16:10:03 +10:00 |
|
|
Mashy
|
dedb9d8b96
|
Added block animation
|
2018-12-14 16:07:20 +10:00 |
|
|
Mashy
|
aca21d267d
|
Added heals and removed enemy hitbox in target phase
|
2018-12-13 18:12:44 +10:00 |
|
|
Mashy
|
0c8258d895
|
added ko
|
2018-12-13 14:19:01 +10:00 |
|
|
Mashy
|
c832f92adf
|
skill rework
|
2018-12-13 13:31:28 +10:00 |
|
|
Mashy
|
431b028859
|
added effects
|
2018-12-11 17:53:22 +10:00 |
|
|
Mashy
|
13c50726bc
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-12-11 15:29:39 +10:00 |
|
|
Mashy
|
22dbf5f893
|
Added cryp status text for attacking and blocking
|
2018-12-11 15:29:22 +10:00 |
|
|
Mashy
|
a24a64c811
|
All skills draggable, hitbox change color on hover with skill
|
2018-12-07 15:50:39 +10:00 |
|
|
Mashy
|
ab3f714aee
|
Draggable skills during target phase
|
2018-12-07 14:25:55 +10:00 |
|
|
Mashy
|
3c2a7dbd45
|
revamped hitboxes
|
2018-12-06 22:08:48 +10:00 |
|
|
Mashy
|
eb12e4c568
|
Fixed animation targets
|
2018-12-06 15:27:58 +10:00 |
|
|
Mashy
|
0e9a2a4ee6
|
Moved skills and they disappear when animation starts
|
2018-12-06 11:41:44 +10:00 |
|
|
Mashy
|
879110435f
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-12-05 21:20:52 +10:00 |
|
|
Mashy
|
b39ef6f059
|
click handler for cryp
|
2018-12-05 21:20:22 +10:00 |
|
|
Mashy
|
fa498c587f
|
file modes
|
2018-12-05 18:44:09 +10:00 |
|
|
Mashy
|
b98067db86
|
logs skip KO
|
2018-12-05 18:42:56 +10:00 |
|
|
Mashy
|
91ceaff9ed
|
-x
|
2018-12-05 17:07:56 +10:00 |
|
|
Mashy
|
e622e03e03
|
Logs and combat working again
|
2018-12-05 17:07:26 +10:00 |
|
|
Mashy
|
797cdf47e2
|
-x
|
2018-12-05 14:19:26 +10:00 |
|
|
Mashy
|
f857b55198
|
Split combat scenes
|
2018-12-05 14:18:41 +10:00 |
|
|
Mashy
|
6892a58341
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-12-04 20:29:18 +10:00 |
|
|
Mashy
|
9f7925c7aa
|
filemode
|
2018-12-04 20:28:01 +10:00 |
|
|
Mashy
|
681b9dab4e
|
remove team check fixed scene swap
|
2018-12-04 20:26:17 +10:00 |
|
|
Mashy
|
89355075a4
|
button refactor
|
2018-12-04 19:08:58 +10:00 |
|
|
Mashy
|
6e5b6c2c80
|
Added skill scene and some info / forget / learn handlers
|
2018-12-04 18:15:07 +10:00 |
|
|
Mashy
|
f1d6c8d17d
|
Merge branch 'playerscene'
|
2018-12-04 15:20:50 +10:00 |
|
|
Mashy
|
8610039e58
|
Added statsheet scene
|
2018-12-04 15:16:16 +10:00 |
|
|
Mashy
|
4c184106fd
|
testing scene swaps
|
2018-11-29 17:29:04 +10:00 |
|
|
Mashy
|
0dd96ae961
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-11-29 01:48:36 +10:00 |
|
|
Mashy
|
0a9040b427
|
scene restart stuff, doesn't spam rerender
|
2018-11-29 01:48:13 +10:00 |
|
|
Mashy
|
342394ddfa
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-11-28 11:47:12 +10:00 |
|
|
Mashy
|
c74782502f
|
Cryps no longer constantly rerender, only update on phase change
|
2018-11-28 11:34:04 +10:00 |
|
|
Mashy
|
05f8c8b6ba
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-11-27 19:48:10 +10:00 |
|
|
Mashy
|
63966ee59c
|
misc function changes
|
2018-11-27 19:47:53 +10:00 |
|
|
Mashy
|
72cd7fc635
|
Merge branch 'master' of ssh://cryps.gg:40022/~/cryps
|
2018-11-27 13:40:08 +10:00 |
|
|
Mashy
|
898cb1cad6
|
Cleaned up tweening functions
|
2018-11-27 13:39:45 +10:00 |
|
|
Mashy
|
7c7bb030ad
|
refactoring stuff
|
2018-11-27 12:43:21 +10:00 |
|
|
Mashy
|
98d8c7e29b
|
Cryps move for combat
|
2018-11-26 21:26:34 +10:00 |
|
|
Mashy
|
ab7de7d77d
|
Added keybinds
|
2018-11-26 18:13:38 +10:00 |
|
|
Mashy
|
99ff116e2d
|
cryp arrangement
|
2018-11-26 15:25:59 +10:00 |
|
|
Mashy
|
c677e90f42
|
Added dynamic health bar
|
2018-11-25 18:20:27 +10:00 |
|