Commit Graph
722 Commits
Author SHA1 Message Date
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
Mashy b83c824795 fixt button and other misc shit 2019-03-15 20:39:18 +10: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
Mashy 56e4c22e05 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-15 19:26:42 +10:00
Mashy 1e9f174e7b Added skills to cryp avatar 2019-03-15 19:26:22 +10: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
Mashy 31060f681e Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-15 14:03:49 +10:00
Mashy ddc48d1740 Reworking instance UI page 2019-03-15 14:02:14 +10:00
ntr 2321450139 refunds 2019-03-15 14:57:45 +11:00
ntr 42b35f9d8c player names 2019-03-15 12:51:30 +11:00
Mashy 2486045333 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-14 22:41:37 +10: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
Mashy 50104e8421 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-14 18:31:09 +10: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
Mashy 258f6c866d Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-14 15:50:09 +10:00
Mashy 9a5f92cf7f join games in progress 2019-03-14 15:49:51 +10: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
Mashy c036750a4b Add specs 2019-03-06 17:19:31 +10:00
ntr 5ea6b911ad vbox specs 2019-03-06 18:08:39 +11:00
Mashy 9ba8c478cc fix deallocate bug 2019-03-06 15:28:49 +10:00
Mashy b022845ff7 inv deallocate on click 2019-03-06 15:26:09 +10:00
Mashy a455b2b1f3 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-06 11:59:58 +10:00
Mashy c8b19d2875 Fixed varibox for new structure 2019-03-06 11:58:28 +10: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
Mashy 4afe114bdd Fixed item drag, added score 2019-03-05 20:35:07 +10: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
Mashy 26250d5b74 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-05 14:57:42 +10:00
Mashy 99d0231a9c change to bitmap text 2019-03-05 14:52:59 +10:00