Commit Graph

  • 61a2a7500b fix stamina and hp bug ntr 2019-03-14 16:36:58 +11:00
  • 2eae21f12f fix ready up clone ntr 2019-03-14 16:22:49 +11:00
  • 43775ea23d shield specs ntr 2019-03-14 16:04:18 +11:00
  • 52cf570a70 update scores ignores phase ntr 2019-03-06 18:35:22 +11:00
  • c036750a4b Add specs Mashy 2019-03-06 17:19:31 +10:00
  • 5ea6b911ad vbox specs ntr 2019-03-06 18:08:39 +11:00
  • 9ba8c478cc fix deallocate bug Mashy 2019-03-06 15:28:49 +10:00
  • b022845ff7 inv deallocate on click Mashy 2019-03-06 15:26:09 +10:00
  • a455b2b1f3 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2019-03-06 11:59:58 +10:00
  • c8b19d2875 Fixed varibox for new structure Mashy 2019-03-06 11:58:28 +10:00
  • 1eb2f6084c socket update for vbox ntr 2019-03-06 12:52:17 +11:00
  • b4cf3f4eb4 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2019-03-06 12:48:50 +11:00
  • 897ace6ed2 vbox split ntr 2019-03-06 12:47:55 +11:00
  • 4afe114bdd Fixed item drag, added score Mashy 2019-03-05 20:35:07 +10:00
  • fd1c693f01 Revert "change to bitmap text" ntr 2019-03-05 17:59:57 +11:00
  • 9e16201f3d vbox wip ntr 2019-03-05 17:59:10 +11:00
  • 26250d5b74 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2019-03-05 14:57:42 +10:00
  • 99d0231a9c change to bitmap text Mashy 2019-03-05 14:52:59 +10:00
  • b04686495b leave properly ntr 2019-03-05 15:45:26 +11:00
  • 6dcab420fd Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2019-03-05 15:45:20 +11:00
  • 8f5a43219b remove webgl from combat ntr 2019-03-05 15:42:29 +11:00
  • 5fa964c382 fix outline Mashy 2019-03-05 11:44:45 +10:00
  • 7e2e44fc57 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2019-03-04 14:05:00 +11:00
  • 29c2781622 first round vbox ntr 2019-03-04 14:04:35 +11:00
  • a8ff3f0a23 Highlight lines on cryps on select Mashy 2019-03-04 12:52:53 +10:00
  • 37acbaedfd Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2019-03-04 13:13:21 +11:00
  • 8b18e7aa20 more drops ntr 2019-03-04 13:12:22 +11:00
  • 2eb8318ae1 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2019-03-03 17:33:59 +10:00
  • 5dddb2a237 Vbox Economy Mashy 2019-03-03 17:33:45 +10:00
  • 9dcb21eefa bot wins ntr 2019-03-03 13:06:32 +11:00
  • 813972efb6 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2019-03-03 12:21:05 +11:00
  • cb30ed8415 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2019-03-03 11:19:45 +10:00
  • e032d0c44c waste of time line Mashy 2019-03-03 11:19:12 +10:00
  • 228d64d73d various instance fixs ntr 2019-03-03 12:17:40 +11:00
  • f4e1c368e0 instance game finished ntr 2019-03-02 20:10:30 +11:00
  • c60f38716f hp stuff ntr 2019-03-01 19:37:04 +11:00
  • 298c263a60 fix invalid item combiner box error Mashy 2019-03-01 16:05:21 +10:00
  • 904a1e8a56 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2019-03-01 15:52:58 +10:00
  • 92a249879d Update cryps on player update Mashy 2019-03-01 15:52:42 +10:00
  • 4b60fa6f4c Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2019-03-01 15:26:07 +11:00
  • ec2304adbb update players when vboxing ntr 2019-03-01 15:23:30 +11:00
  • a59de136ac Instances shown by default on home Mashy 2019-03-01 13:56:34 +10:00
  • 1afe725295 Merge branch 'instance_join' of ssh://cryps.gg:40022/~/cryps into instance_join ntr 2019-03-01 14:44:35 +11:00
  • b1be8aa3bf instance ready rejoins ntr 2019-03-01 14:44:27 +11:00
  • 750a81c29f Get playerlist on home page Mashy 2019-03-01 10:54:56 +10:00
  • dafbf145f8 added instances to its own scene Mashy 2019-02-28 22:04:25 +10:00
  • 8abe18b0f1 Fixed player set Mashy 2019-02-28 20:51:45 +10:00
  • 8c89bd6841 Add instances from player list Mashy 2019-02-28 17:58:23 +10:00
  • 7589ae84d4 instance game ntr 2019-02-28 17:45:26 +11:00
  • 3c5f37f520 Merge branch 'master' into instance_join ntr 2019-02-28 15:14:40 +11:00
  • 4acad1bab1 outcomes ntr 2019-02-28 15:14:08 +11:00
  • ec3711e6bc about to start testing ntr 2019-02-28 12:14:32 +11:00
  • b093374391 unlearn skills, just need rpc call Mashy 2019-02-26 14:00:29 +10:00
  • c4453a6934 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2019-02-25 16:09:28 +10:00
  • cdfa66fa72 Added multi scene to homepage, placeholder for rankings / news / shop Mashy 2019-02-25 16:09:10 +10:00
  • 556366bf8f demo fix ntr 2019-02-25 15:29:04 +11:00
  • 7ab27d51d2 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2019-02-25 15:28:28 +11:00
  • 404378ee88 demo fix ntr 2019-02-25 15:28:19 +11:00
  • 6f2c42d460 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2019-02-25 13:44:16 +10:00
  • 0008b8e398 Return to home page Mashy 2019-02-25 13:43:59 +10:00
  • afe992d986 account players method ntr 2019-02-25 14:06:41 +11:00
  • c6329de8ab Added home page Mashy 2019-02-22 17:45:41 +10:00
  • d0bc63a0de fix typo with isntance and timestamps ntr 2019-02-22 16:34:57 +11:00
  • 6d44a5de5e Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2019-02-22 15:26:19 +10:00
  • 161db2dc51 testing instance join Mashy 2019-02-22 15:25:36 +10:00
  • da21350fda comment zones: ntr 2019-02-22 16:15:49 +11:00
  • 909af4c9e3 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2019-02-22 16:00:48 +11:00
  • 967b316e37 recovery for get_cryp ntr 2019-02-22 16:00:39 +11:00
  • 5135882423 Bug fixes Mashy 2019-02-22 14:07:32 +10:00
  • 8c3a2f1438 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2019-02-22 13:37:29 +10:00
  • 29772ad3ae UI updates Mashy 2019-02-22 13:35:47 +10:00
  • 96f31346c5 fix bug and make scaling look tight ntr 2019-02-22 14:34:55 +11:00
  • caf827e42b Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2019-02-22 13:00:38 +10:00
  • b542efda25 Client changes Mashy 2019-02-22 13:00:17 +10:00
  • 8d17bf71b1 svgs ntr 2019-02-22 13:59:46 +11:00
  • ab11c2109e remove some unused fns ntr 2019-02-22 12:40:09 +11:00
  • 36af689c7b Merge branch 'combos' Mashy 2019-02-21 14:58:56 +10:00
  • 0edad81ec6 More SPECS info Mashy 2019-02-21 14:57:03 +10:00
  • a76543b456 Merge branch 'instances' ntr 2019-02-21 15:03:36 +11:00
  • 9b68fd0a09 Merge branch 'combos' ntr 2019-02-21 15:03:21 +11:00
  • e8fa2aec30 players on join ntr 2019-02-21 15:02:19 +11:00
  • d5d6254daf whew ntr 2019-02-21 13:54:35 +11:00
  • 613444d066 wip ntr 2019-02-21 12:05:27 +11:00
  • 168cdd4104 Colour items Mashy 2019-02-21 11:03:50 +10:00
  • 21c657a1a2 More spec info Mashy 2019-02-21 10:29:38 +10:00
  • 3fc759f854 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos Mashy 2019-02-20 18:49:11 +10:00
  • e8a3011e85 Spec Info Mashy 2019-02-20 18:48:56 +10:00
  • 94eb259409 remove some derives ntr 2019-02-19 23:31:39 +11:00
  • 3dfdaf2514 unreachable ntr 2019-02-19 23:25:17 +11:00
  • 8a06c8b976 can't make it ntr 2019-02-19 23:14:39 +11:00
  • 0b07e121ad rename siphon ntr 2019-02-19 15:56:30 +11:00
  • af20e9aae8 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos Mashy 2019-02-19 14:55:45 +10:00
  • 54b1c8f1c0 vbox combos, keep items in combiner Mashy 2019-02-19 14:44:15 +10:00
  • eb9fd6e4af more colour codes ntr 2019-02-19 14:24:17 +11:00
  • 23188f53f0 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos Mashy 2019-02-19 12:43:04 +10:00
  • a4b91065ff Delete, apply and single click combine Mashy 2019-02-19 12:42:51 +10:00
  • 8a9fa4b6fb drop fix ntr 2019-02-19 13:38:21 +11:00
  • fcb8bf779e fix statbar ntr 2019-02-19 12:10:44 +11:00
  • 53a54c2123 drop and apply ntr 2019-02-19 11:59:13 +11:00
  • 1beb53ec51 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos ntr 2019-02-19 11:45:42 +11:00