search

Zyllos / tts_ftc_base_lua_scripts

FTC Map Base Lua Scripts
3 stars 2 forks source link

Stop updateAll() from Destroying Secondary Selections #2

Closed Zyllos closed 3 years ago

Zyllos commented 3 years ago

Resolved issue with updateAll() setting secondary objective data instead of just displaying what is already selected.

Zyllos commented 3 years ago

Awaiting Phubar to review.

Zyllos commented 3 years ago

Not ready to be reviewed as per the linked issue.

Zyllos commented 3 years ago

Resolved issue and now ready to be reviewed.

Zyllos commented 3 years ago

As per the last commit, I have resolved some inconsistencies I found on the last merge. This should have completed the updates and should be ready for pulling down the branch and testing the fixes.

Zyllos commented 3 years ago

Branch is ready for review.

kurcenkurce commented 3 years ago

Did this branch get mangled? How are there 17 commits to merge?

Zyllos commented 3 years ago

Probably me trying to make sure the file had the right changes to it, committing in changes, pushing them, seeing it was wrong, recommitting changes, and seeing other stuff wrong.

I would agree, it kind of does look like it's mangled. But, the end information looks right for all the commits.

Zyllos commented 3 years ago

Also, there were three rebases involved here. So, that might do it.

kurcenkurce commented 3 years ago

The answer is: yes. It is very mangled. But, the code changes themselves are correct. The repository history will look ugly but who cares. The end result is correct.

Zyllos commented 3 years ago

I R dumb...