766 Commits

Author SHA1 Message Date
Mashy
a8ff3f0a23 Highlight lines on cryps on select 2019-03-04 12:52:53 +10:00
ntr
37acbaedfd Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-04 13:13:21 +11:00
ntr
8b18e7aa20 more drops 2019-03-04 13:12:22 +11:00
Mashy
2eb8318ae1 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-03 17:33:59 +10:00
Mashy
5dddb2a237 Vbox Economy 2019-03-03 17:33:45 +10:00
ntr
9dcb21eefa bot wins 2019-03-03 13:06:32 +11:00
ntr
813972efb6 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-03 12:21:05 +11:00
Mashy
cb30ed8415 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-03 11:19:45 +10:00
Mashy
e032d0c44c waste of time line 2019-03-03 11:19:12 +10:00
ntr
228d64d73d various instance fixs 2019-03-03 12:17:40 +11:00
ntr
f4e1c368e0 instance game finished 2019-03-02 20:10:30 +11:00
ntr
c60f38716f hp stuff 2019-03-01 19:37:04 +11:00
Mashy
298c263a60 fix invalid item combiner box error 2019-03-01 16:05:21 +10:00
Mashy
904a1e8a56 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-01 15:52:58 +10:00
Mashy
92a249879d Update cryps on player update 2019-03-01 15:52:42 +10:00
ntr
4b60fa6f4c Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-01 15:26:07 +11:00
ntr
ec2304adbb update players when vboxing 2019-03-01 15:23:30 +11:00
Mashy
a59de136ac Instances shown by default on home 2019-03-01 13:56:34 +10:00
ntr
1afe725295 Merge branch 'instance_join' of ssh://cryps.gg:40022/~/cryps into instance_join 2019-03-01 14:44:35 +11:00
ntr
b1be8aa3bf instance ready rejoins 2019-03-01 14:44:27 +11:00
Mashy
750a81c29f Get playerlist on home page 2019-03-01 10:54:56 +10:00
Mashy
dafbf145f8 added instances to its own scene 2019-02-28 22:04:25 +10:00
Mashy
8abe18b0f1 Fixed player set 2019-02-28 20:51:45 +10:00
Mashy
8c89bd6841 Add instances from player list 2019-02-28 17:58:23 +10:00
ntr
7589ae84d4 instance game 2019-02-28 17:45:26 +11:00
ntr
3c5f37f520 Merge branch 'master' into instance_join 2019-02-28 15:14:40 +11:00
ntr
4acad1bab1 outcomes 2019-02-28 15:14:08 +11:00
ntr
ec3711e6bc about to start testing 2019-02-28 12:14:32 +11:00
Mashy
b093374391 unlearn skills, just need rpc call 2019-02-26 14:00:29 +10:00
Mashy
c4453a6934 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-25 16:09:28 +10:00
Mashy
cdfa66fa72 Added multi scene to homepage, placeholder for rankings / news / shop 2019-02-25 16:09:10 +10:00
ntr
556366bf8f demo fix 2019-02-25 15:29:04 +11:00
ntr
7ab27d51d2 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-25 15:28:28 +11:00
ntr
404378ee88 demo fix 2019-02-25 15:28:19 +11:00
Mashy
6f2c42d460 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-25 13:44:16 +10:00
Mashy
0008b8e398 Return to home page 2019-02-25 13:43:59 +10:00
ntr
afe992d986 account players method 2019-02-25 14:06:41 +11:00
Mashy
c6329de8ab Added home page 2019-02-22 17:45:41 +10:00
ntr
d0bc63a0de fix typo with isntance and timestamps 2019-02-22 16:34:57 +11:00
Mashy
6d44a5de5e Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-22 15:26:19 +10:00
Mashy
161db2dc51 testing instance join 2019-02-22 15:25:36 +10:00
ntr
da21350fda comment zones: 2019-02-22 16:15:49 +11:00
ntr
909af4c9e3 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-22 16:00:48 +11:00
ntr
967b316e37 recovery for get_cryp 2019-02-22 16:00:39 +11:00
Mashy
5135882423 Bug fixes 2019-02-22 14:07:32 +10:00
Mashy
8c3a2f1438 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-22 13:37:29 +10:00
Mashy
29772ad3ae UI updates 2019-02-22 13:35:47 +10:00
ntr
96f31346c5 fix bug and make scaling look tight 2019-02-22 14:34:55 +11:00
Mashy
caf827e42b Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-02-22 13:00:38 +10:00
Mashy
b542efda25 Client changes 2019-02-22 13:00:17 +10:00