3135 Commits

Author SHA1 Message Date
ntr
842fc65051 Merge branch 'automnml' of ssh://git.mnml.gg:40022/home/mnml/mnml into automnml 2021-03-20 13:33:30 +10:00
Mashy
7576081c52 see colours 2021-03-20 13:33:05 +10:00
ntr
e5e5a737b8 fix colour checks 2021-03-20 13:32:08 +10:00
Mashy
6026203066 Merge branch 'automnml' of ssh://git.mnml.gg:40022/~/mnml into automnml 2021-03-20 13:04:33 +10:00
Mashy
f3a5ff6820 remove spec limit 2021-03-20 12:59:28 +10:00
ntr
6028d97d99 fix colour calcs for construct stats 2021-03-20 12:53:28 +10:00
ntr
4c4304e60e big getup for ubuntu setup, construct colour based skills 2021-03-20 12:45:29 +10:00
Mashy
8cb7e0c419 wip getting client prep for changes 2021-03-14 16:06:23 +10:00
Mashy
4fac208d8b remove targetting arrows and skills from combat, reduce construct hp 2020-08-24 12:32:27 +10:00
Mashy
9dfd3a733a autobattler init 2020-08-18 16:33:40 +10:00
ntr
cc8ffc946e Merge tag '1.14.1' into develop
1.14.1
2020-02-10 13:19:54 +10:00
ntr
edccfbc42b Merge branch 'release/1.14.1' 2020-02-10 13:19:51 +10:00
ntr
9ed191d9ae finish games when finishing idle instances 2020-02-10 13:19:44 +10:00
ntr
36b5b5088b wrap invite copy navigator clipboard check 2020-02-06 14:37:43 +10:00
ntr
077b79e49f v1.14.1 2020-02-06 14:10:46 +10:00
ntr
bf6d0c2202 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2020-02-05 20:37:52 +10:00
Mashy
c39cfba970 fix aside scrollbar shit 2020-02-05 20:37:17 +10:00
ntr
1d9ab02ff3 upkeep game id 2020-02-05 20:35:37 +10:00
ntr
4b3d5d5586 Merge tag '1.14.0' into develop
1.14.0
2020-02-05 20:09:53 +10:00
ntr
4abcfdef0c Merge branch 'release/1.14.0' 2020-02-05 20:09:47 +10:00
ntr
7539b40f08 increase duration 2020-02-05 20:09:43 +10:00
ntr
0e97eb462d disable clear button on game finished 2020-02-05 15:14:50 +10:00
ntr
c3a8463ea9 fix sketchy idle animation 2020-02-04 20:56:03 +10:00
ntr
0a0db9e57f set pvp false when connecting 2020-02-04 11:37:24 +10:00
ntr
262eaa357b v1.14.0 2020-01-31 15:00:51 +10:00
ntr
87af1fded7 fix register prompt 2020-01-31 15:00:29 +10:00
Mashy
1f2dcbe83f can_be_disabled skill fix (absorption) 2020-01-31 13:29:29 +10:00
Mashy
2e7a8c3530 absorb silence test 2020-01-31 11:45:06 +10:00
ntr
db1516bef6 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2020-01-31 10:52:37 +10:00
ntr
40f3bb5be6 Merge tag '1.13.0' into develop
1.13.0
2020-01-31 10:52:17 +10:00
ntr
229f97e3d2 Merge branch 'release/1.13.0' 2020-01-31 10:52:12 +10:00
ntr
d4913fd2ff game ctrl timer" 2020-01-28 22:49:49 +10:00
ntr
52e6c05885 email fix 2020-01-28 22:49:41 +10:00
ntr
8927873a62 reload on instance missing 2020-01-24 14:25:22 +10:00
ntr
8af5f3f3e7 electrocute always goes off 2020-01-23 17:37:24 +10:00
ntr
6e3675364e tick effect matching reimpl 2020-01-23 16:23:25 +10:00
Mashy
594fe49eb2 timeout to clear vbox tutorial 2020-01-23 14:59:44 +10:00
ntr
153b3a1e9c return to usize based socket ids to solve multiple tab issue 2020-01-23 11:52:12 +10:00
Mashy
d5ba372264 Invite link text same as play.jsx 2020-01-23 11:19:33 +10:00
ntr
4173e690c0 Merge branch 'develop' into release/1.13.0 2020-01-23 11:17:05 +10:00
Mashy
5580f035df invite link 1 click copy 2020-01-23 11:15:59 +10:00
ntr
13dea561f8 Merge branch 'develop' into release/1.13.0 2020-01-22 15:03:25 +10:00
ntr
855c427fa0 v1.13.0 2020-01-22 15:02:07 +10:00
Mashy
04b60b758a tutorial ready disabled only for first round 2020-01-22 13:07:38 +10:00
ntr
d47a902a89 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2020-01-22 12:30:37 +10:00
ntr
1b9ba25cec add icons 2020-01-22 12:26:42 +10:00
ntr
4b6e4544f1 ethan icons 2020-01-22 12:26:23 +10:00
Mashy
4324615083 fix vbox info / highlight state when interacting with constructs (unequip) 2020-01-21 15:54:29 +10:00
Mashy
adff7ebefa Merge tag '1.12.4' into develop
1.12.4
2020-01-20 16:04:17 +10:00
Mashy
350db19f46 Merge branch 'release/1.12.4' 2020-01-20 16:04:02 +10:00