Commit Graph
100 Commits
Author SHA1 Message Date
ntr cd26efb42d instance finish fix 2019-03-19 16:49:23 +11:00
ntr ac29473471 mm invalid fix 2019-03-18 22:16:49 +11:00
ntr d19391ea27 team combos and green damage 2019-03-18 19:42:20 +11:00
ntr b3eb770d80 global game updates 2019-03-18 18:12:49 +11:00
ntr 5fe394370d global mm and startup 2019-03-18 16:36:26 +11:00
ntr 8b825db044 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-18 13:53:01 +11:00
ntr 9b8dc12ddd fix bot instance join 2019-03-18 12:43:00 +11:00
ntr 0d37444b73 cryp colours 2019-03-17 17:28:30 +11:00
ntr f91c31d502 starting items alignment 2019-03-17 13:18:18 +11:00
ntr 022524f6bc set ready and increase balance on win/loss 2019-03-15 22:24:39 +11:00
ntr 4f1bd34ca6 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-15 22:03:50 +11:00
ntr f8d515e2dc Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-15 21:31:18 +11:00
ntr 5c3ad25fe0 simplify cryps 2019-03-15 21:31:14 +11:00
ntr fac6191c2e standardise stats 2019-03-15 21:18:45 +11:00
ntr 15e78a63db remove attack from spawned cryps 2019-03-15 19:46:50 +11:00
ntr 879313d91b attack var is a skill 2019-03-15 19:43:27 +11:00
ntr 0b21a5090d unequip specs 2019-03-15 19:42:38 +11:00
ntr 9df24a8f07 unequip 2019-03-15 19:31:43 +11:00
ntr 5d76593901 traits 2019-03-15 19:03:21 +11:00
ntr 085db76001 Revert "roll specs into vars"
This reverts commit 0dad45ccb0.
2019-03-15 18:15:14 +11:00
ntr 0dad45ccb0 roll specs into vars 2019-03-15 17:49:24 +11:00
ntr 037da44852 drop -> reclaim 2019-03-15 15:43:32 +11:00
ntr 629c5f373e Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-15 15:24:28 +11:00
ntr 0013c6437d move combos to structs 2019-03-15 15:24:24 +11:00
ntr 2321450139 refunds 2019-03-15 14:57:45 +11:00
ntr 42b35f9d8c player names 2019-03-15 12:51:30 +11:00
ntr c2fe8f779e use balance to purchase 2019-03-14 23:40:06 +11:00
ntr 2c89db4f01 sort specs so they are applied properly 2019-03-14 22:16:33 +11:00
ntr e6986d57cd shield specs 2019-03-14 19:29:31 +11:00
ntr 788c68c015 stam -> hp 2019-03-14 18:57:44 +11:00
ntr 9d02499c5a simplify spec and skill var checks 2019-03-14 18:03:21 +11:00
ntr cf3dbaa6e9 global join better 2019-03-14 17:11:43 +11:00
ntr 61a2a7500b fix stamina and hp bug 2019-03-14 16:36:58 +11:00
ntr 2eae21f12f fix ready up clone 2019-03-14 16:22:49 +11:00
ntr 43775ea23d shield specs 2019-03-14 16:04:18 +11:00
ntr 52cf570a70 update scores ignores phase 2019-03-06 18:35:22 +11:00
ntr 5ea6b911ad vbox specs 2019-03-06 18:08:39 +11:00
ntr 1eb2f6084c socket update for vbox 2019-03-06 12:52:17 +11:00
ntr b4cf3f4eb4 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-06 12:48:50 +11:00
ntr 897ace6ed2 vbox split 2019-03-06 12:47:55 +11:00
ntr fd1c693f01 Revert "change to bitmap text"
This reverts commit 99d0231a9c.
2019-03-05 17:59:57 +11:00
ntr 9e16201f3d vbox wip 2019-03-05 17:59:10 +11:00
ntr b04686495b leave properly 2019-03-05 15:45:26 +11:00
ntr 6dcab420fd Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-05 15:45:20 +11:00
ntr 8f5a43219b remove webgl from combat 2019-03-05 15:42:29 +11:00
ntr 7e2e44fc57 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-04 14:05:00 +11:00
ntr 29c2781622 first round vbox 2019-03-04 14:04:35 +11: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
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
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
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
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
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
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
ntr afe992d986 account players method 2019-02-25 14:06:41 +11:00
ntr d0bc63a0de fix typo with isntance and timestamps 2019-02-22 16:34:57 +11: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
ntr 96f31346c5 fix bug and make scaling look tight 2019-02-22 14:34:55 +11:00
ntr 8d17bf71b1 svgs 2019-02-22 13:59:46 +11:00
ntr ab11c2109e remove some unused fns 2019-02-22 12:40:09 +11:00
ntr a76543b456 Merge branch 'instances' 2019-02-21 15:03:36 +11:00
ntr 9b68fd0a09 Merge branch 'combos' 2019-02-21 15:03:21 +11:00
ntr e8fa2aec30 players on join 2019-02-21 15:02:19 +11:00
ntr d5d6254daf whew 2019-02-21 13:54:35 +11:00
ntr 613444d066 wip 2019-02-21 12:05:27 +11:00
ntr 94eb259409 remove some derives 2019-02-19 23:31:39 +11:00
ntr 3dfdaf2514 unreachable 2019-02-19 23:25:17 +11:00
ntr 8a06c8b976 can't make it 2019-02-19 23:14:39 +11:00
ntr 0b07e121ad rename siphon 2019-02-19 15:56:30 +11:00
ntr eb9fd6e4af more colour codes 2019-02-19 14:24:17 +11:00
ntr 8a9fa4b6fb drop fix 2019-02-19 13:38:21 +11:00
ntr fcb8bf779e fix statbar 2019-02-19 12:10:44 +11:00
ntr 53a54c2123 drop and apply 2019-02-19 11:59:13 +11:00
ntr 1beb53ec51 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos 2019-02-19 11:45:42 +11:00
ntr 26950e886a apply var 2019-02-19 11:34:32 +11:00
ntr 0db40b6fdc combo combos 2019-02-18 17:53:20 +11:00
ntr 6f035d9839 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos 2019-02-18 14:09:31 +11:00
ntr b6408d5abe combos 2019-02-18 14:08:49 +11:00
ntr 2c2e1dddbe vbox write 2019-02-17 00:21:47 +11:00
ntr cf038f9626 Merge branch 'combos' of ssh://cryps.gg:40022/~/cryps into combos 2019-02-17 00:13:01 +11:00
ntr 4a28ecd3fc usize 2019-02-17 00:12:56 +11:00
ntr 08e48d983e socket fns for vbox 2019-02-16 19:46:00 +11:00
ntr 04714dfdfd vbox accept 2019-02-16 19:45:04 +11:00
ntr 01468c7081 remove item from server 2019-02-16 18:32:29 +11:00
ntr d0525a56bd vbox init 2019-02-16 17:45:28 +11:00
ntr 8f12075d52 recalc stats on spec remove 2019-02-16 11:07:47 +11:00
ntr a822177fb8 dmg -> damage 2019-02-16 10:58:10 +11:00