9 Apr 2019 |
sophie | ddevault: I made a few fixes to your rename branch: https://github.com/wmww/godot/commits/generic_unix | 23:17:01 |
ddevault | thanks, let me cherry pick these | 23:17:30 |
sophie | To be clear, I'm considering myself to have the mutex lock back on the display abstraction stuff. Since we're editing the same commits over and over we can't combine changes if you do anything to that now. | 23:18:14 |
ddevault | updated the display-abstraction-rebase branch as well | 23:18:25 |
sophie | Will do | 23:18:34 |
ddevault | oh, I figured you could just rebase/cherry-pick in whatever you need | 23:18:43 |
ddevault | but yeah, do your thing | 23:18:51 |
ddevault | I'm done working for today | 23:18:55 |
sophie | I can rebase on anything and cherry-pick anything. What I mean is if you amend "Split display code out of OS class" at the same time I do, it will be a hell of a job to merge the two amends to the same commit. | 23:20:30 |
ddevault | ack | 23:20:51 |
10 Apr 2019 |
sophie | ddevault: I fixed the compatibility thing they're talking about (and a comment that seems to have gotten erroneously reverted to a previous state): https://github.com/wmww/godot/commits/generic_unix | 13:32:50 |
ddevault | morning wmww | 13:36:56 |
ddevault | thanks | 13:36:57 |
sophie | Also talked to hpvb again. just now. He has some issues with the current state of my big PR, but says it gets some work out of the way. He plans to build on top of it and I offered my help. | 13:43:37 |
sophie | ddevault: Are you in the Godot engine IRC? it's #godotengine-devel on Freenode | 13:50:15 |
ddevault | yes | 13:50:24 |
sophie | kk, just wondering | 13:50:41 |
12 Apr 2019 |
Timo K. | ddevault: | 08:41:48 |
Timo K. | I have issues running the wayland branch | 08:42:04 |
Timo K. | (put a comment in the pr you made) | 08:42:26 |
13 Apr 2019 |
Timo K. | ddevault: any idea what the issue i have are caused by? | 00:53:22 |
16 Apr 2019 |
ddevault | toger5: yes | 13:23:51 |
ddevault | I'll address them shortly | 13:23:57 |
ddevault | sorry for the delay, I just can't into matrix | 13:24:05 |
ddevault | wmww: I'm rebasing my rename patch, I'll push a rebase of your patch to a branch as well | 13:45:36 |
sophie | ddevault: sure, link me and I'll update my branch | 13:47:23 |
ddevault | +1 | 13:48:40 |
ddevault | wmww: https://github.com/status-im/godot/tree/display-abstraction-3 | 14:27:31 |
sophie | Synced my branch | 14:36:30 |
ddevault | fix coming up for the CI errors | 14:41:58 |