search

RPTools / maptool

Virtual Tabletop for playing roleplaying games with remote players or face to face.
http://rptools.net
GNU Affero General Public License v3.0
787 stars 259 forks source link

Rel 1 15 dev merge #4907

Closed cwisniew closed 2 weeks ago

cwisniew commented 2 weeks ago

Identify the Bug or Feature request

Merge 1.15 branch back into develop

This change is Reviewable

thelsing commented 2 weeks ago

Commmit bd6f2ef hast so many changes that I can't tell if they are correct as I wasn't really involved in 1.15. I'm not sure if changes that @kwvanderlinde did are undone with it.

cwisniew commented 2 weeks ago

Commmit bd6f2ef hast so many changes that I can't tell if they are correct as I wasn't really involved in 1.15. I'm not sure if changes that @kwvanderlinde did are undone with it.

Yeah I just had a look, git has made an absolute mess of the merge. Sadly it looks like we are going to have to go through all the changes in 1.15 and re do them (ugh)

kwvanderlinde commented 2 weeks ago

That'll be due to the accidental merge of develop in to release-1.15 (cf937dab7) and the subsequent revert. We should undo that to avoid any future headaches. I.e., reset release-1.15 to 4ac15e49b, then redo the few PRs that went into 1.15 since then:

I'd be happy to do it if you'd like to avoid the tedium.