Compare commits

...

10 Commits

Author SHA1 Message Date
2776532133 rebased networking onto main with new name 2022-12-22 09:15:13 -05:00
38d51409b6 Merge remote-tracking branch 'origin/networking' into networking
# Conflicts:
#	pypong/networking/gui.py
#	pypong/networking/host.py
2022-12-22 09:14:27 -05:00
671533de79 changed max scan requests to 128 2022-12-22 09:13:37 -05:00
6ab6bb5cf8 revised some variables and wording 2022-12-22 09:13:37 -05:00
ac7880e1c2 changed host.py to be a super basic server that just responds with an echo 2022-12-22 09:13:37 -05:00
5b4892ab69 updated networking __init__.py 2022-12-22 09:13:34 -05:00
f87075fa51 added packet.py and the Packet class 2022-12-22 09:13:31 -05:00
b47b59ec7d added docstrings and comments 2022-12-22 09:13:24 -05:00
99feadc7e2 implemented checking for network connections in gui 2022-12-22 09:13:22 -05:00
5c1a61f25c renamed project to PynPong 2022-12-22 09:08:06 -05:00
10 changed files with 7 additions and 11 deletions

View File

@@ -1 +1 @@
recursive-include pypong * recursive-include pynpong *

View File

@@ -1,4 +1,4 @@
# PyPong # PynPong
[![License: GNU GPL v3.0](https://img.shields.io/badge/license-GNU%20GPL%20v3.0-blue)](LICENSE) [![License: GNU GPL v3.0](https://img.shields.io/badge/license-GNU%20GPL%20v3.0-blue)](LICENSE)
A game of pong made in PyGame, designed to be used over a network connection. A game of pong made in PyGame, designed to be used over a network connection.

View File

View File

@@ -21,7 +21,7 @@ def main():
executor = concurrent.futures.ThreadPoolExecutor(max_workers=MAX_SCAN_REQUESTS) executor = concurrent.futures.ThreadPoolExecutor(max_workers=MAX_SCAN_REQUESTS)
main_window = tk.Tk() main_window = tk.Tk()
main_window.title('PyPong Launcher') main_window.title('PynPong Launcher')
main_window.resizable(width=False, height=False) main_window.resizable(width=False, height=False)
main_window.geometry('500x300') main_window.geometry('500x300')
@@ -117,7 +117,7 @@ def main():
return shortened_info return shortened_info
# Create the top title label # Create the top title label
title_label = tk.Label(text='PyPong Launcher', fg='white', bg='#000040', padx=1, pady=20) title_label = tk.Label(text='PynPong Launcher', fg='white', bg='#000040', padx=1, pady=20)
title_label.pack(side=tk.TOP, fill=tk.BOTH) title_label.pack(side=tk.TOP, fill=tk.BOTH)
# Create the list of games # Create the list of games

View File

@@ -1,4 +0,0 @@
"""
Contains all networking code and classes to get the game to communicate over UDP, along with a GUI to help connection
go smoothly.
"""

View File

@@ -1,5 +1,5 @@
import setuptools import setuptools
import pypong import pynpong
with open('requirements.txt') as fh: with open('requirements.txt') as fh:
required = fh.read().splitlines() required = fh.read().splitlines()
@@ -9,13 +9,13 @@ with open('README.md', 'r') as fh:
setuptools.setup( setuptools.setup(
name='PyPong', name='PyPong',
version=pypong.__version__, version=pynpong.__version__,
author='Nicholas Dyer', author='Nicholas Dyer',
description='A game of pong made in PyGame for play over a local network', description='A game of pong made in PyGame for play over a local network',
license='GNU GPL-3.0', license='GNU GPL-3.0',
long_description=long_description, long_description=long_description,
long_description_content_type='text/markdown', long_description_content_type='text/markdown',
url='https://gitea.citruxx.com/ndyer/PyPong', url='https://gitea.citruxx.com/ndyer/PynPong',
packages=setuptools.find_packages(), packages=setuptools.find_packages(),
# https://pypi.org/classifiers/ # https://pypi.org/classifiers/
classifiers=[ classifiers=[