Teeworlds - development

CarmineZ

Any smart tv OS ?

They are usually based on Android.

Bamcane

[teeworlds/teeworlds] Pull request opened: #3292 Update the copyright year

Should we make the editor UI more modernize?

I think someone started on that

You means the editor2?

yes

Just my opinion, but it's not modern enough.

05:50

At least, I think the tool bar shouldn't be the right side of the window.

05:51

That makes the left side of the window look very empty.

Also it has been hard to rebase it on latest teeworlds.

Well, no one volunteered to contribute to it, so it stayed stale and unfinished

Dune

Well, no one volunteered to contribute to it, so it stayed stale and unfinished

I'd love to. But it's too hard to rebase it(I have tried)——I would rather create new one instead.

Bamcane

I'd love to. But it's too hard to rebase it(I have tried)——I would rather create new one instead.

the editor should not have changed on the base game. rebasing editorv2 on top of master should be straightforward

13:36

if anyone messed with the editor in the master branch just drop the commits and list them or something.

Yeah

but oy should have safeguarded that well ernough

But it takes a long time.

Dune

if anyone messed with the editor in the master branch just drop the commits and list them or something.

I can't do that.

much less long than rewriting it

Bamcane

I can't do that.

why not?

mem_alloc()

Bamcane

mem_alloc()

One of the change that messed with the editor2.

Bamcane

One of the change that messed with the editor2.

what did they change?

In the editor2:

void *mem_alloc_debug(const char *filename, int line, unsigned size, unsigned alignment);
#define mem_alloc(s,a) mem_alloc_debug(__FILE__, __LINE__, (s), (a))

In the master: void *mem_alloc(unsigned size);

13:41

And also:

but that's not a change in master

13:41

so you can rebase editor2 on master without any issue?

13:41

what's the conflicting master change

Dune

so you can rebase editor2 on master without any issue?

No

13:44

Also

Dune

but that's not a change in master

^

Dune

what's the conflicting master change

^

Hm

13:45

What do you think 'conflicting' means?

it means, if there have been no change on master that touch the code areas of the code that were modified on editor2, then you can rebase editor2 on master without git conflicts

No, there are lots of git conflicts

can you explain why? (edited)

13:48

this could be an issue with how you're approaching the git rebase (edited)

>

13:48

Oh

13:48

So that you means

Bamcane

>

I can't see much from this

13:49

which git command did you use for the rebase?

13:49

(or you're using a gui?)

GUI

13:49

Then I can abort it.

i'll have a look in 15min

Dune

I can't see much from this

That's one of the rebase commit.

13:54

I need to rebase 257 commits.

Bamcane

I need to rebase 257 commits.

that's not scary. most of these commits are completely independent

This is the part that makes me upset.

13:57

I don't know if I should keep the master

this adds an optional parameter, should be fine.

13:57

keep the optional parameter and add the two new functions

13:57

so you keep both changes.

How can I merge the submodule?

there should be no conflicts in submodules? just apply whatever master changes

There is a conflict in submodule languages