Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: awdev1/FormicAcid-Radar-Revive
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.15
Choose a base ref
...
head repository: awdev1/FormicAcid-Radar-Revive
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on May 5, 2024

  1. Add UAC prompt

    DangerChamp authored May 5, 2024
    Copy the full SHA
    01545ed View commit details

Commits on May 7, 2024

  1. Fix overlay display issue

    awdev1 authored May 7, 2024
    Copy the full SHA
    e6400d1 View commit details
  2. Merge pull request #2 from DangerChamp/DangerChamp-patch-1

    Added administrator elevation
    awdev1 authored May 7, 2024
    Copy the full SHA
    d64c245 View commit details
  3. Copy the full SHA
    f32201f View commit details
  4. Copy the full SHA
    c0d0815 View commit details
  5. Copy the full SHA
    526ce81 View commit details

Commits on May 11, 2024

  1. Copy the full SHA
    4120aa4 View commit details
  2. fix spelling

    awdev1 authored May 11, 2024
    Copy the full SHA
    8765980 View commit details

Commits on May 12, 2024

  1. Copy the full SHA
    f64ec13 View commit details

Commits on May 13, 2024

  1. Update readme, add .ico for applet

    Updated the readme to be a tad more fancier/descriptive, and added an icon for the control application.
    
    NOTE: The overlay.py script was updated in this case with the icon bitmap, not sure if that is what 100% runs the main application. Check line 42.
    axisdadev committed May 13, 2024
    Copy the full SHA
    8198fd8 View commit details
  2. Add requested changes

    axisdadev committed May 13, 2024
    Copy the full SHA
    332ac27 View commit details
  3. Update README.md

    axisdadev committed May 13, 2024
    Copy the full SHA
    7149945 View commit details
  4. Update README.md

    axisdadev committed May 13, 2024
    Copy the full SHA
    9601cd9 View commit details
  5. Update README.md

    axisdadev committed May 13, 2024
    Copy the full SHA
    badcbf6 View commit details
  6. Merge pull request #3 from axisdadev/main

    Update readme, add .ico for applet
    awdev1 authored May 13, 2024
    Copy the full SHA
    56e311d View commit details

Commits on May 14, 2024

  1. Add Discord Link

    awdev1 authored May 14, 2024
    Copy the full SHA
    46b9ebb View commit details

Commits on May 18, 2024

  1. Fix file name

    DangerChamp authored May 18, 2024
    Copy the full SHA
    b4b52e4 View commit details
  2. Merge pull request #4 from DangerChamp/patch-1

    Fix install issue
    awdev1 authored May 18, 2024
    Copy the full SHA
    a15fe01 View commit details

Commits on May 23, 2024

  1. Add option menui

    Lets users choose between option 1 and 2 (failsafe)
    Option 1 opens the youtube tutorial for the radar
    Option 2 contiues with the scuffed setup
    Zedruc committed May 23, 2024
    Copy the full SHA
    ea31799 View commit details
  2. Merge pull request #5 from Zedruc/setup_script

    here we go......
    awdev1 authored May 23, 2024
    Copy the full SHA
    e1fe82a View commit details
  3. Update Guided-Semi-Auto-Install.bat

    remove good video and replace with better one 💀
    awdev1 authored May 23, 2024
    Copy the full SHA
    d5f7ef9 View commit details

Commits on Jul 14, 2024

  1. Copy the full SHA
    739ccd8 View commit details
Showing with 78 additions and 33 deletions.
  1. BIN FormicRadarIcon.ico
  2. BIN FormicRadarIcon.png
  3. +47 −21 Guided-Semi-Auto-Install.bat
  4. +29 −10 README.md
  5. +2 −2 overlay.py
  6. BIN readme_banner.png
Binary file added FormicRadarIcon.ico
Binary file not shown.
Binary file added FormicRadarIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 47 additions & 21 deletions Guided-Semi-Auto-Install.bat
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
@echo off




REM Check for admin rights
net session >nul 2>nul
if %errorlevel% neq 0 (
powershell -Command "Start-Process \"%0\" -Verb RunAs"
exit /b
)

echo "___________ .__ _____ .__ .___ "
echo "\_ _____/__________ _____ |__| ____ / _ \ ____ |__| __| _/ "
@@ -24,18 +27,36 @@ echo "|___|___| /____ > |__| (____ /____/____/\___ >__| "
echo " \/ \/ \/ \/ "



rem Intro Screen
echo ======================================================
echo Welcome to the FormicRadar Installer Script
echo Made by: awdev (Reviewed by: Beani)
echo Auto QuietInstall by DangerChamp
echo Made by: awdev
echo Auto QuietInstall and UAC by DangerChamp
echo ======================================================
echo.
echo IF YOU WOULD RATHER FOLLOW A VIDEO GO TO BEANI'S CHANNEL VIA THE LINK POSTED IN THE PTFS TOOLS Server
echo.
echo.
echo.

:mainmenu
echo.........................................................
echo: Option Menu :
echo:.......................................................:
echo: 1. Open YouTube Tutorial :
echo: 2. Continue With Integrated Step-by-Step installation :
echo:.......................................................:
choice /C:12 >nul

if %errorlevel% equ 1 goto openytvideo
if %errorlevel% equ 2 goto setup

:quit
exit /b

:openytvideo
rem Replace with actual youtube tutorial link once you have a video up again
rem as vision closed his channel and the videos are unavailable lol
start "" https://www.youtube.com/watch?v=LYUFJBMxizM
goto quit

:setup
echo.
echo.
echo.
@@ -69,46 +90,51 @@ if %errorlevel% equ 0 (
echo Python 3.10 is installed
) else (
echo Python 3.10 is not installed
echo Click Yes on the UAC Prompt
echo Downloading Python installer...
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://www.python.org/ftp/python/3.10.0/python-3.10.0-amd64.exe', 'python_installer.exe')"
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://www.python.org/ftp/python/3.10.0/python-3.10.0-amd64.exe', 'python_installer310.exe')"
echo Installing Python 3.10...
start "" /wait python_installer.exe /quiet InstallAllUsers=1 TargetDir="C:\Python310" PrependPath=1
del python_installer.exe
start "" /wait python_installer310.exe /quiet InstallAllUsers=1 TargetDir="C:\Python310" PrependPath=1
del python_installer310.exe
PAUSE
)
) else (
echo Python is not installed
echo Click Yes on the UAC Prompt
echo Downloading Python installer...
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://www.python.org/ftp/python/3.10.0/python-3.10.0-amd64.exe', 'python_installer.exe')"
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://www.python.org/ftp/python/3.10.0/python-3.10.0-amd64.exe', 'python_installer310.exe')"
echo Installing Python 3.10...
start "" /wait python_installer.exe /quiet InstallAllUsers=1 TargetDir="C:\Python310" PrependPath=1
del python_installer.exe
start "" /wait python_installer310.exe /quiet InstallAllUsers=1 TargetDir="C:\Python310" PrependPath=1
del python_installer310.exe
PAUSE
)

echo Both Node.js and Python 3.10 are now (hopefully) installed.
echo Both Node.js and Python 3.10 are installed.
echo.
echo.
echo.
echo.
echo.
echo "Open OBS, go to the top toolbar and click tools, scripts, Python Settings, and import this following file path:"
echo "C:/Users/REPLACE THIS WITH YOUR WINDOWS USERNAME/AppData/Local/Programs/Python/Python310 (you will need to click the 'browse' button and insert the path thru the top large search bar)"
echo "C:/Users/REPLACE THIS WITH YOUR WINDOWS USERNAME/AppData/Local/Programs/Python/Python310 (you will need to click the 'Browse' button and insert the path thru the top large search bar)"
PAUSE
echo .
echo "Next click apply and go to Tools, Websocket Server Settings, Enable Websocket Server, set port to 4455, and Disable Authentication, Click apply and ur done with that part."
PAUSE
echo .
echo "Next Open the Scenes folder by clicking any button. When this opens you will need to open the scenes folder in the radar folder. Then copy those json files to the obs scenes folder"
PAUSE
echo .
start %UserProfile%\AppData\Roaming\obs-studio\basic\scenes
PAUSE
echo .
echo "once done run init.bat in /(radarfolder)/scripts you should only need to run init once."
PAUSE
echo .
echo "Now run start.bat in the same folder and open 'radar-control.exe' in the main radar folder here. Be sure to open obs if you closed it"
PAUSE
echo "When you have opened radar control, go to obs and Click Scene Collect and select any airport. Restart radar control."
echo .
echo "When you have opened radar control, go to obs and Click Scene Collection and select any airport. Restart radar control."
PAUSE
echo .
echo "Congrats! You have installed Formic's Radar. Enjoy."
PAUSE
exit
39 changes: 29 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,39 @@
# FormicRadar Revive
# Download from the releases tab
# FormicAcid Radar Revive 📡

![Project Banner](readme_banner.png?raw=true)

![Static Badge](https://img.shields.io/badge/license-MIT-red?link=https%3A%2F%2Fopensource.org%2Flicense%2Fmit) ![Static Badge](https://img.shields.io/badge/mom_made-pizza_rolls-blue?link=https%3A%2F%2Fopensource.org%2Flicense%2Fmit)
![GitHub forks](https://img.shields.io/github/forks/awdev1/FormicAcid-Radar-Revive)
![GitHub Repo stars](https://img.shields.io/github/stars/awdev1/FormicAcid-Radar-Revive)

## Usage

Once installed and configured, you can use this to track virtual aircraft, manage air traffic, and enhance your flight simulation experience.

## Contributing

Contributions to FormicAcid Radar Revive are welcome! If you have any ideas, bug fixes, or feature enhancements, feel free to submit a pull request.
> 📡 **The best radar tool** for managing PTFS Air Traffic.
## Support

For support or assistance, please open an issue on GitHub or contact the repository owner.
> ✈️ This tool allows you to track & manage air traffic in PTFS and enhance your PTFS controlling experience.
## License
> 🌍 **Best used for ATC24** or Anything PTFS ATC!
This project is licensed under the [MIT License](LICENSE).

## Installation 🔧

1. Get the latest [release](<https://github.com/awdev1/FormicAcid-Radar-Revive/releases>)
2. Unzip the folder to a suitable destination via 7zip, winRAR or file explorer.
3. Run **Guided-Semi-Auto-Install.bat**
4. Configure to your liking & enjoy! ⭐

😔 **Stuck?** Check the video tutorial [here](<https://www.youtube.com/watch?v=LYUFJBMxizM>)

## Contributing 🤝

**Contributions to the project are welcome!** If you have any ideas, bug fixes or upgrades. Feel free to submit a PR (pull request!)

## Support 💁

For support or bug reports, open a [Github Issue](<https://github.com/awdev1/FormicAcid-Radar-Revive/issues>) or go to the [Discord](<https://discord.gg/g9wgbWSTxC>)

## License 🪪

This project is licensed under the [MIT License](https://opensource.org/license/mit).
4 changes: 2 additions & 2 deletions overlay.py
Original file line number Diff line number Diff line change
@@ -37,13 +37,13 @@
root = Tk()
root.attributes('-alpha', 0.002)
root.attributes('-topmost', True)
root.geometry("1920x1080+1920+0")
root.geometry("1920x1080+0+0")
root.overrideredirect(True)

top = Toplevel(root)
top.attributes('-transparentcolor', transparent_color)
top.attributes('-topmost', True)
top.geometry("1920x1080+1920+0")
top.geometry("1920x1080+0+0")
top.overrideredirect(True)
root.focus_set()
canvas = Canvas(top, bg=transparent_color, highlightthickness=0)
Binary file added readme_banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.