Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Emscripten compatibility #81

Closed
wants to merge 24 commits into from
Closed

[WIP] Emscripten compatibility #81

wants to merge 24 commits into from

Conversation

jsoutherland
Copy link

For converting libwallaby programs to javascript.

@Zacharyprime Zacharyprime added this to Potential Feature in KIPR Wombat Developers Feb 13, 2020
Prithviraj Kadiyala and others added 10 commits March 5, 2020 02:24
A pull request got merged that removed this because it was from an earlier point in the master branch. 
This is putting the wait_for_light function back that wasn't intended to be removed.
Putting the fixed version of wait_for_light back
Pull from kipr master
Testing has shown that the Wombat can handle 640x480.

Have not tested higher resolutions yet :-)
Set HIGH_RES as the Wombat camera default
@Zacharyprime
Copy link
Member

Zacharyprime commented Mar 11, 2021

I tried resolving these conflicts.
botball_c.cpp should just be removed from this pull request,
the changes made are not relevant because we have changed that file entirely.
For some reason, the comparison menu is showing the wrong version of the master files.
The text it shows as the master version for botball_c is just straight up wrong (probably because of how old this branch is).

I couldn't quite see what was causing camera.cpp to conflict (in a way that git shouldn't have been able to resolve)

This branch is also so far behind the master that it might be a headache to try and get it to merge with master without causing issues. I personally think it would be easier to go through the changes made here, and manually re-apply the changes off a new branch from the master.

@Zacharyprime Zacharyprime removed this from Potential Feature in KIPR Wombat Developers Jun 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants