Commit Graph

Select branches

Hide Pull Requests

automnml

develop

main

master

Mono Color

• fd518ba4e2 breakage inc ntr 2019-07-29 18:08:24 +10:00
• 1940c437b0 names and hiero ntr 2019-07-29 12:20:56 +10:00
• e5c8b78ec1 names ntr 2019-07-29 00:24:10 +10:00
• 8cd0f1af36 team setting and postgres constraint ntr 2019-07-29 00:11:46 +10:00
• 9fdda7c52c remove instance list ntr 2019-07-27 21:01:58 +10:00
• 66223033b0 practice rpc ntr 2019-07-27 19:24:52 +10:00
• fb84e1becf clear skills during anim phase Mashy 2019-07-27 11:23:55 +10:00
• 84c0a187c2 pay for constructs Mashy 2019-07-27 11:12:00 +10:00
• f295235b52 fn names Mashy 2019-07-26 21:30:20 +10:00
• abd35b8bef spawning constructs (no mtx yet) Mashy 2019-07-26 21:22:11 +10:00
• b72c819c63 Merge branch 'develop' into buy-constructs Mashy 2019-07-26 20:01:26 +10:00
• d87bc44990 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop ntr 2019-07-26 17:28:33 +10:00
• d03c07cc59 = ntr 2019-07-26 17:28:16 +10:00
• 813fc0184f yes ntr 2019-07-26 17:27:38 +10:00
• 7c619a8bec HAWT ntr 2019-07-26 16:39:55 +10:00
• 4726a8c5b3 here we go ntr 2019-07-26 15:24:35 +10:00
• 61fa990a15 wip team select back in Mashy 2019-07-26 14:00:01 +10:00
• 8adcd08daf we hawt ntr 2019-07-26 00:17:45 +10:00
• 86d77d23bb carnnnn cunt ntr 2019-07-25 23:59:51 +10:00
• 2aafa76f66 carnnnn cunt ntr 2019-07-25 23:59:46 +10:00
• 066c61c227 wip ntr 2019-07-25 21:45:27 +10:00
• be7a388812 YEH ntr 2019-07-25 17:11:56 +10:00
• a77bec2c9f wip ntr 2019-07-25 14:33:03 +10:00
• a3a2cf9852 fix team nav bug Mashy 2019-07-25 14:29:05 +10:00
• 5851f20211 wip ntr 2019-07-24 16:35:33 +10:00
• 384cdb2de5 better decay ntr 2019-07-24 13:35:03 +10:00
• d431ada7a9 reclaim button fixes ntr 2019-07-24 12:21:04 +10:00
• 9dc840765c styles and blast ntr 2019-07-24 12:04:18 +10:00
• 16c83a529b vbox actions ntr 2019-07-23 20:42:54 +10:00
• 3bb0dcca3e vbox second buy method ntr 2019-07-23 20:19:43 +10:00
• 0c8f0f819c mad circles ntr 2019-07-23 19:09:35 +10:00
• 8e8a6a3673 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop ntr 2019-07-23 19:09:30 +10:00
• bce277d28b worklog and vbox circles ntr 2019-07-23 19:04:20 +10:00
• 441cf3bc47 fix buff and debuff Mashy 2019-07-23 18:29:19 +10:00
• 2dc929de40 Merge remote-tracking branch 'origin/develop' into develop Mashy 2019-07-23 18:07:39 +10:00
• 4c68d11a28 aoe targetting fixed Mashy 2019-07-23 18:04:33 +10:00
• 12ff5aec66 add break cb ntr 2019-07-23 17:18:56 +10:00
• 420b3b71e9 actually fix cb ntr 2019-07-23 17:08:12 +10:00
• c248ab40f9 fix cb ntr 2019-07-23 17:05:45 +10:00
• 5baffffd69 icon stuff ntr 2019-07-23 17:01:43 +10:00
• 7c8f724209 Merge branch 'develop' into line-anims ntr 2019-07-23 16:42:11 +10:00
• 341f4dda09 blast and text colours ntr 2019-07-23 16:40:40 +10:00
• eef880e052 attak ntr 2019-07-23 16:01:07 +10:00
• ef11d14752 fix cb for banish/invert Mashy 2019-07-23 15:57:50 +10:00
• d03eec1423 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop Mashy 2019-07-23 15:05:19 +10:00
• a816e75554 return cb from anim componentWillUnmount() Mashy 2019-07-23 15:05:03 +10:00
• 4c6ee01b5d Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop ntr 2019-07-23 14:21:09 +10:00
• 10369dee17 less ntr 2019-07-23 14:17:46 +10:00
• 90a60ebd65 construct buttons ntr 2019-07-23 14:17:41 +10:00
• 711a83ba56 better icons ntr 2019-07-23 13:52:00 +10:00
• 5c35c2d195 icons wip ntr 2019-07-23 13:42:23 +10:00
• 314b34be19 unfocus all constructs between resolutions Mashy 2019-07-23 12:01:58 +10:00
• e14cf22b2f Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop ntr 2019-07-23 11:56:54 +10:00
• aa3bb65907 names ntr 2019-07-23 11:56:05 +10:00
• dd98016e2a remove log Mashy 2019-07-22 19:58:08 +10:00
• 8a60a181d1 fixed bots Mashy 2019-07-22 19:55:57 +10:00
• 36ce1385da wip Mashy 2019-07-22 18:31:26 +10:00
• 71b3ecb2df worklog ntr 2019-07-22 16:23:22 +10:00
• f9650f748f Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop ntr 2019-07-22 16:22:21 +10:00
• ca16090555 fix blocking mesasges ntr 2019-07-22 16:21:43 +10:00
• 10dc04b73d Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop Mashy 2019-07-22 15:31:53 +10:00
• 64896cfb3a no longer set resolution, everything from event loop Mashy 2019-07-22 15:30:46 +10:00
• 5275c26ac8 shapes ntr 2019-07-22 13:29:12 +10:00
• b1aa559fee pubsub logging ntr 2019-07-22 13:16:48 +10:00
• b04ae8a8d4 styles ntr 2019-07-22 11:33:05 +10:00
• c8c2d08522 rename III -> ++ ntr 2019-07-22 11:05:21 +10:00
• 627653924b put ping back ntr 2019-07-21 20:41:41 +10:00
• e63d946e60 specs to 3 ntr 2019-07-21 20:39:12 +10:00
• e95d559edd wht ntr 2019-07-21 20:38:01 +10:00
• 3088d104da Merge branch 'vbox-rework' into develop ntr 2019-07-21 20:12:12 +10:00
• 5e5cb1a7b0 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop ntr 2019-07-21 20:11:54 +10:00
• 19d1118cc4 yew ntr 2019-07-21 20:10:52 +10:00
• 4ab8e99f1d fix boolean 0 check bullshit ntr 2019-07-20 22:44:36 +10:00
• c69182b94e new combiner ntr 2019-07-20 22:30:03 +10:00
• ffc043d526 vbox stuff ntr 2019-07-20 21:46:54 +10:00
• 145f8e6a35 wip" ntr 2019-07-20 18:04:08 +10:00
• 938d53048e misc Mashy 2019-07-20 11:18:25 +10:00
• 4db44e0b59 great victory Mashy 2019-07-20 11:15:47 +10:00
• c44cd44933 register account proper err handling Mashy 2019-07-20 01:04:02 +10:00
• b289ed92de tidying fns Mashy 2019-07-19 21:01:12 +10:00
• 3f1367172d fix construct img reloads ntr 2019-07-19 20:46:38 +10:00
• 9f0c212643 serialize stages as strings ntr 2019-07-19 20:16:27 +10:00
• 2026530370 fix banish and invert ntr 2019-07-19 19:58:08 +10:00
• 9c45a3fb7a getting somewhere Mashy 2019-07-19 19:46:54 +10:00
• 51d3c76460 wip Mashy 2019-07-19 19:19:29 +10:00
• 4ea3adcff3 comments ntr 2019-07-19 19:10:44 +10:00
• adf6700049 ganba ntr 2019-07-19 19:07:03 +10:00
• bd517a1926 text back ntr 2019-07-19 19:03:22 +10:00
• c94fc46f34 pow ntr 2019-07-19 18:35:31 +10:00
• 52b42b772a yes baybee ntr 2019-07-19 18:31:37 +10:00
• 8d8a79c712 good ntr 2019-07-19 18:24:46 +10:00
• 18ac220006 nearly there ntr 2019-07-19 16:19:44 +10:00
• 47b9d496dc update anims test ntr 2019-07-19 14:47:48 +10:00
• 028606e804 wip ntr 2019-07-18 22:41:29 +10:00
• 67e0bb7c15 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop ntr 2019-07-18 20:41:56 +10:00
• 7eb34b4350 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop Mashy 2019-07-18 20:32:15 +10:00
• fd87d15069 change 1 line fix everything Mashy 2019-07-18 20:31:26 +10:00
• 860c70c4a1 delete notifications ignored ntr 2019-07-18 12:50:52 +10:00
• 9633e4f4c6 fix instance start ntr 2019-07-17 19:14:53 +10:00
• 328bdf533a additional message types ntr 2019-07-17 17:35:31 +10:00