Commit Graph

Select branches

Hide Pull Requests

automnml

develop

main

master

Mono Color

• 0839cd5efc shits fked Mashy 2019-04-03 18:28:06 +10:00
• cdf0cd6cfe more icons ntr 2019-04-03 17:31:25 +11:00
• 31d8516652 icons ntr 2019-04-03 17:22:06 +11:00
• 68ae9ba2cb Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2019-04-03 15:56:12 +11:00
• aca1e939d1 vbox spacing ntr 2019-04-03 15:56:09 +11:00
• 91040c6176 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2019-04-03 14:54:36 +10:00
• c39edf0931 Unequip and tidy item info Mashy 2019-04-03 14:29:22 +10:00
• 42124c8c48 cryp spawn button ntr 2019-04-03 13:21:28 +11:00
• 43c0af4ded spawn buttons ntr 2019-04-03 00:10:58 +11:00
• d61691d9df login ntr 2019-04-02 20:22:40 +11:00
• 51b8d23f91 nginx back ntr 2019-04-02 18:25:43 +11:00
• 48b2c1ff80 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2019-04-02 18:19:42 +11:00
• 23c7ae7aab nginx change ntr 2019-04-02 18:18:53 +11:00
• 73b4922a23 nginx change ntr 2019-04-02 18:18:53 +11:00
• 4c16afa786 take particles out for prod ntr 2019-04-02 18:15:40 +11:00
• 325d7c5428 Merge branch 'return-of-react' of ssh://cryps.gg:40022/~/cryps into return-of-react ntr 2019-04-02 18:04:42 +11:00
• 15f87027b5 ko ntr 2019-04-02 18:02:25 +11:00
• 595e2683c0 whew ntr 2019-04-02 17:59:21 +11:00
• 0044205e9f wip ntr 2019-04-02 17:21:02 +11:00
• d7f66a99f0 moved particles into cryp box, activate on skill Mashy 2019-04-02 16:17:53 +10:00
• 743c5a792d wip ntr 2019-04-02 17:05:54 +11:00
• 3ec2419f8d padding ntr 2019-04-02 15:56:00 +11:00
• 94b6cbe140 game wip ntr 2019-04-02 15:51:00 +11:00
• 26136e23f5 game wip ntr 2019-04-02 15:24:33 +11:00
• 7e70d2122d instance ntr 2019-04-02 15:11:04 +11:00
• a7092c6bd3 isntance wip ntr 2019-04-02 14:24:42 +11:00
• 5c6498b1f7 Merge branch 'return-of-react' into spa ntr 2019-04-02 12:26:41 +11:00
• eb85155605 instance list ntr 2019-04-02 12:26:25 +11:00
• d867a75254 Added particles.js Mashy 2019-04-02 11:21:20 +10:00
• 9f2114f3a0 cryp list ntr 2019-04-01 15:53:37 +11:00
• 3bb4f1adec header ntr 2019-04-01 15:01:47 +11:00
• f9582aeb8b moar ntr 2019-04-01 14:22:09 +11:00
• 5dbf348327 styles and vbox sort ntr 2019-04-01 14:13:51 +11:00
• cc5c02099f remove extra game ntr 2019-04-01 12:49:51 +11:00
• 172e84df54 Merge branch 'return-of-react' of ssh://cryps.gg:40022/~/cryps into return-of-react Mashy 2019-04-01 11:32:16 +10:00
• b832360224 Added item info Mashy 2019-04-01 11:29:04 +10:00
• 631295e3b7 focus ntr 2019-04-01 12:28:30 +11:00
• c31f11624b styles ntr 2019-04-01 12:22:10 +11:00
• 4c74671320 vbox fix ntr 2019-04-01 11:12:23 +11:00
• 27473ffdd5 ko ntr 2019-04-01 11:03:28 +11:00
• 56b0a7f890 cooldowns ntr 2019-04-01 10:41:51 +11:00
• 414e8a927b stack ntr 2019-03-31 19:04:04 +11:00
• 6cd844c53a some resizing ntr 2019-03-31 18:11:47 +11:00
• 59a1f808e9 self target ntr 2019-03-31 18:00:10 +11:00
• 1358259512 vbox apply ntr 2019-03-31 17:51:13 +11:00
• cdd45894ce moar styles ntr 2019-03-31 16:23:55 +11:00
• 5e31f2f842 figcap ntr 2019-03-31 14:56:32 +11:00
• 5f8490d8e2 moar ntr 2019-03-31 14:04:05 +11:00
• b9175ecc53 game styles ntr 2019-03-31 14:01:51 +11:00
• e466b65819 mess with styles and reclaim ntr 2019-03-31 13:30:28 +11:00
• e2169ea890 combiner stuff ntr 2019-03-30 21:42:43 +11:00
• 058a368d7b moar ntr 2019-03-30 20:06:10 +11:00
• 0af3ea9d40 Merge branch 'master' into return-of-react ntr 2019-03-30 17:52:40 +11:00
• 0c0adfb2fd fix taunt ntr 2019-03-30 17:52:31 +11:00
• 9f462bbfcc blah ntr 2019-03-29 22:27:38 +11:00
• 8f52f9370c Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2019-03-29 22:25:24 +11:00
• c4ec34ed39 u64 mult ntr 2019-03-29 22:23:53 +11:00
• e77545eaec u64 mult ntr 2019-03-29 22:23:53 +11:00
• 09f6617094 u64 mult ntr 2019-03-29 22:23:00 +11:00
• cfcbe1c7e1 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2019-03-29 21:59:37 +11:00
• 02fd57446a siphon in ntr 2019-03-29 21:59:29 +11:00
• 7be246ab0b team lengths Mashy 2019-03-29 20:41:27 +10:00
• c90d7afc9d Fix hitbox bug Mashy 2019-03-29 20:26:54 +10:00
• f7daa96550 pkg ntr 2019-03-29 21:00:13 +11:00
• 4346790330 bit o cleaning ntr 2019-03-29 20:14:32 +11:00
• e5f027dc24 cant send skills Mashy 2019-03-29 16:21:44 +10:00
• 30b9909e22 Merge branch 'return-of-react' of ssh://cryps.gg:40022/~/cryps into return-of-react Mashy 2019-03-29 15:25:20 +10:00
• dffae5c3e7 merge Mashy 2019-03-29 15:24:48 +10:00
• b3a4bdc301 split out logs Mashy 2019-03-29 14:55:20 +10:00
• c42cc73707 Merge branch 'return-of-react' of ssh://cryps.gg:40022/~/cryps into return-of-react ntr 2019-03-29 15:36:43 +11:00
• 383330ddad Battles are back on the menu Mashy 2019-03-29 13:33:44 +10:00
• 41b328a815 overflow ntr 2019-03-29 13:49:34 +11:00
• e9817f75e0 Merge branch 'return-of-react' of ssh://cryps.gg:40022/~/cryps into return-of-react Mashy 2019-03-29 12:40:07 +10:00
• 0380617849 Ready takes you into game Mashy 2019-03-29 12:39:51 +10:00
• 4900e9d31e cryp box ntr 2019-03-29 13:33:48 +11:00
• 1b01fa5bea more wip ntr 2019-03-29 12:32:18 +11:00
• 7b31b2529f cryp box wip ntr 2019-03-29 11:39:45 +11:00
• 2b4f7de097 vbox accept ntr 2019-03-28 17:25:00 +11:00
• 823432d240 combiner table ntr 2019-03-28 17:01:42 +11:00
• e512ad187d Merge branch 'return-of-react' of ssh://cryps.gg:40022/~/cryps into return-of-react ntr 2019-03-28 16:58:07 +11:00
• 170a5a06ab :weassey ntr 2019-03-28 16:57:48 +11:00
• 7cebebd9a3 eassey ntr 2019-03-28 16:57:48 +11:00
• 4e1b1dd2cb pog ntr 2019-03-28 15:23:03 +11:00
• 2494b2dd5f injure ntr 2019-03-28 07:24:51 +11:00
• efb55f6024 Show colours added by skills Mashy 2019-03-27 17:21:42 +10:00
• a64572e6a2 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2019-03-27 15:40:36 +10:00
• e7aee86aae Added skill descriptions, cleaned up some scenes Mashy 2019-03-27 15:40:17 +10:00
• dc81298992 fix corruption tick speed ntr 2019-03-27 14:32:42 +11:00
• a6926e9c7a just convert from bulk file (ask me for it) ntr 2019-03-27 14:28:23 +11:00
• 81f25a3f38 molecules ntr 2019-03-27 13:34:43 +11:00
• d4c43ce50f siphon test ntr 2019-03-27 01:02:01 +11:00
• d73e798646 few more skills back in ntr 2019-03-26 20:37:27 +11:00
• 5f3b4d9354 hatred applies dmg to red/blue ntr 2019-03-26 20:01:13 +11:00
• 556557089d alignment ntr 2019-03-26 19:05:37 +11:00
• 52edc38cba hatred/hostility ntr 2019-03-26 19:00:38 +11:00
• 26ab281fdb Merge branch 'master' of ssh://cryps.gg:40022/~/cryps ntr 2019-03-26 19:00:32 +11:00
• b13c0e22d6 hatred wip ntr 2019-03-26 18:19:55 +11:00
• 075680a667 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps Mashy 2019-03-26 17:04:22 +10:00
• 2c8ddcd186 improved decay combat sequence Mashy 2019-03-26 17:04:06 +10:00
• 24767b9c86 make skill resolution a regular function ntr 2019-03-26 17:40:37 +11:00