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.

Sign up for GitHub

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

Jump to bottom

Ivo/RTSP server fixes #185

Merged
merged 7 commits into from
Apr 30, 2021
Merged

Ivo/RTSP server fixes #185

merged 7 commits into from
Apr 30, 2021

Commits on Apr 29, 2021

  1. WIP

    @izivkov
    izivkov committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    957546a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into Ivo/video-for-all-fragments 

    # Conflicts:
#	android/app/src/main/java/org/openbot/env/RtspServer.java
#	android/controller/python/keyboard-controller-ui.py
    @izivkov
    izivkov committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    b5a292e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into Ivo/video-for-all-fragments 

    # Conflicts:
#	android/app/src/main/java/org/openbot/env/RtspServer.java
#	android/controller/python/keyboard-controller-ui.py
    @izivkov
    izivkov committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    62196da View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2021

  1. - Delay starting the RTSP client 1 second to improve staring issues. 

    - Move setting resolution from RtspServer to PhoneController
- Select Nearby connection when WiFi is turned off.
    @izivkov
    izivkov committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    8fedca4 View commit details
    Browse the repository at this point in the history

  2. Delete keyboard-controller-ui.py 

    This file was refactored, moved to `root/python` and is now called `keyboard-pygame.py`
    @thias15
    thias15 authored Apr 30, 2021
    Configuration menu
    Copy the full SHA
    9e4cbc6 View commit details
    Browse the repository at this point in the history

  3. - Added back startServer() to IVideoServer interface.

    @izivkov
    izivkov committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    4ee3026 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/Ivo/video-for-all-fragments' int… 

    …o Ivo/video-for-all-fragments
    @izivkov
    izivkov committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    67afa62 View commit details
    Browse the repository at this point in the history