Mashy
|
35c74ee325
|
buycount bugfix
|
2019-11-21 11:41:08 +10:00 |
|
ntr
|
b0a8684482
|
change tutorial text to show it's not over
|
2019-11-21 12:39:36 +11:00 |
|
Mashy
|
a5d778475e
|
fix buycount combo bug
|
2019-11-21 11:36:06 +10:00 |
|
Mashy
|
5cb9f6ebd0
|
wl remove duplicate vbox hoverFn
|
2019-11-21 11:19:33 +10:00 |
|
Mashy
|
917858174c
|
delete "reclaim" & "vboxHighlight" state variables
|
2019-11-21 11:10:34 +10:00 |
|
Mashy
|
7dc4a3f4f4
|
vbox rearrange, rework reclaim
|
2019-11-21 10:42:15 +10:00 |
|
Mashy
|
3dddf4b1a8
|
wip
|
2019-11-20 23:07:44 +10:00 |
|
Mashy
|
e53983db98
|
rearrange vbox wip
|
2019-11-20 21:47:19 +10:00 |
|
Mashy
|
eb35bea7c6
|
Merge branch 'vbox-combine' into develop
|
2019-11-20 18:47:55 +10:00 |
|
Mashy
|
b6553d89c4
|
tutorial text fix
|
2019-11-20 18:47:22 +10:00 |
|
Mashy
|
19072926e6
|
bits check on combine
|
2019-11-20 16:42:10 +10:00 |
|
Mashy
|
9ee1c166f3
|
don't set info to colours when combining
|
2019-11-20 16:38:28 +10:00 |
|
Mashy
|
ec8697aba1
|
combiner / single item buy cost preview
|
2019-11-20 16:31:25 +10:00 |
|
Mashy
|
eb3d42ea58
|
validVboxSelect for vbox and inventory
|
2019-11-20 15:59:03 +10:00 |
|
Mashy
|
b570bfaad0
|
vbox selecting
|
2019-11-20 13:55:54 +10:00 |
|
Mashy
|
af99883ced
|
remove combiner, vboxSelected fields "shopSelect & stashSelect"
|
2019-11-20 13:45:59 +10:00 |
|
Mashy
|
e35c688cff
|
Combine vboxselect and combiner. Remove itemEquip and dblclick.
|
2019-11-20 13:24:57 +10:00 |
|
ntr
|
8e6561499a
|
concede game round
|
2019-11-20 12:39:09 +11:00 |
|
Mashy
|
52d9367e3c
|
don't clear vbox selected on inventory click
|
2019-11-19 23:11:18 +10:00 |
|
Mashy
|
73b6d0f321
|
clear selected items on new selections, reclaim doesn't turn combine red
|
2019-11-19 22:13:00 +10:00 |
|
Mashy
|
5c0a76b9a6
|
clear vboxselect and combiner on unequip select && highlight unequip
|
2019-11-19 21:40:14 +10:00 |
|
Mashy
|
2ba8a63d81
|
buy/combine from vbox wip
|
2019-11-19 13:09:50 +10:00 |
|
Mashy
|
f2add9a836
|
vbox bits check
|
2019-11-19 12:08:52 +10:00 |
|
Mashy
|
604a604c01
|
vbox selected more wip
|
2019-11-19 12:06:08 +10:00 |
|
Mashy
|
33152e54d5
|
select vbox multiple wip
|
2019-11-19 11:35:30 +10:00 |
|
Mashy
|
0d08536837
|
add vbox indicies as a combine param
|
2019-11-19 10:35:45 +10:00 |
|
Mashy
|
f850a8806b
|
mouseover
|
2019-11-19 10:30:00 +10:00 |
|
Mashy
|
2c14cfc494
|
lock info when vbox / inv items selected
|
2019-11-18 23:58:48 +10:00 |
|
Mashy
|
f66be37f8a
|
unselect vbox item
|
2019-11-17 22:00:08 +10:00 |
|
Mashy
|
496c57ea77
|
hotfix tutorial bits stage bug
|
2019-11-14 21:21:49 +10:00 |
|
ntr
|
917b239647
|
fix double ready
|
2019-11-13 21:37:53 +11:00 |
|
ntr
|
70f99a6ffd
|
game cancelled
|
2019-11-13 21:35:52 +11:00 |
|
ntr
|
44f008740e
|
auto ready for learn mode and remove upkeep warnings
|
2019-11-13 20:51:30 +11:00 |
|
ntr
|
8aee7dc084
|
purified => pure
|
2019-11-13 20:23:59 +11:00 |
|
Mashy
|
7e79e18107
|
Merge branch 'round-bits' into develop
|
2019-11-13 16:11:21 +10:00 |
|
ntr
|
3c8aace660
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-11-13 12:12:17 +11:00 |
|
ntr
|
784c5910a1
|
update mnml service file for syslog
|
2019-11-13 12:11:35 +11:00 |
|
Mashy
|
9da45e1bee
|
30 bits per round
|
2019-11-13 11:02:14 +10:00 |
|
Mashy
|
e31acf96c6
|
group colours together in table, fix the vertical spacing issue
|
2019-11-12 22:01:56 +10:00 |
|
ntr
|
0c0d422dae
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-11-12 19:55:00 +11:00 |
|
ntr
|
d3a4f3e615
|
combo styles
|
2019-11-12 19:49:07 +11:00 |
|
Mashy
|
58dfc407a8
|
only highlight first open slot
|
2019-11-12 18:40:13 +10:00 |
|
Mashy
|
9bcea878ec
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-11-12 16:42:47 +10:00 |
|
Mashy
|
66263be25f
|
table layout wip
|
2019-11-12 16:42:33 +10:00 |
|
ntr
|
1d699d1b62
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-11-12 16:32:28 +11:00 |
|
ntr
|
3ee32b3ef2
|
pvp leave queue implemented
|
2019-11-12 16:32:19 +11:00 |
|
Mashy
|
01fa0c5137
|
Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
|
2019-11-12 15:16:04 +10:00 |
|
Mashy
|
af2f145d17
|
ready through tutorial face off faster
|
2019-11-12 15:15:29 +10:00 |
|
ntr
|
9c4215ebba
|
remove zombie skip code
|
2019-11-12 15:54:08 +11:00 |
|
ntr
|
3a498616fb
|
additional setactive remove
|
2019-11-12 15:52:45 +11:00 |
|