From fbe90e14e31c463422bcc20b8cff527f9bdbb268 Mon Sep 17 00:00:00 2001 From: Marco Bakera Date: Thu, 24 May 2018 16:13:46 +0200 Subject: [PATCH 1/6] port can be specified on the commandline. --- pixelwar/src/main/java/de/paws/pixelwar/PixelServer.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pixelwar/src/main/java/de/paws/pixelwar/PixelServer.java b/pixelwar/src/main/java/de/paws/pixelwar/PixelServer.java index bce0d00..06f5346 100644 --- a/pixelwar/src/main/java/de/paws/pixelwar/PixelServer.java +++ b/pixelwar/src/main/java/de/paws/pixelwar/PixelServer.java @@ -82,7 +82,11 @@ public class PixelServer extends ChannelHandlerAdapter { public static void main(final String[] args) throws InterruptedException, IOException { - new PixelServer(8080).run(); + int port = 8080; + if(args.length == 1) { + port = Integer.parseInt(args[0]); + } + System.out.println("Starting server on port " + port); + new PixelServer(port).run(); } - } From 47fde7fa7e48f265e9d0fa2faf31d70880b632df Mon Sep 17 00:00:00 2001 From: Marcel Hellkamp Date: Fri, 25 May 2018 12:00:33 +0200 Subject: [PATCH 2/6] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 931483f..782c235 100755 --- a/README.md +++ b/README.md @@ -52,6 +52,11 @@ Server written in Java8, based on netty and awt. Optimized for speed and large p sudo apt-get install maven openjdk-8-jdk mvn package java -jar target/pixelwar*-jar-with-dependencies.jar + +or, if you have docker installed but don't want to install maven: + + docker run -it --rm --user "`id -u`:`id -g`" --volume "`pwd`:/build" --workdir /build maven:3-jdk-8-alpine mvn -Duser.home=/build clean package + java -jar target/pixelwar*-jar-with-dependencies.jar #### `/pixelnuke` (C server) From efa739fd1bdb07ac821cec4f5f8996af09366bd5 Mon Sep 17 00:00:00 2001 From: Marcel Hellkamp Date: Sun, 17 Jun 2018 22:16:27 +0200 Subject: [PATCH 3/6] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 782c235..41394c6 100755 --- a/README.md +++ b/README.md @@ -108,3 +108,7 @@ https://www.youtube.com/watch?v=1Jt-X437MKM Pixelflut GPN17 Badge https://www.youtube.com/watch?v=JGg4zqqumvs + +Rüspeler Tüfteltage (Kliemannsland, 2018) +https://youtu.be/TijSQYZoRUU?t=6m + From 7dbd3c29da7900c4abfd0febf5267f601299b370 Mon Sep 17 00:00:00 2001 From: Max Staff Date: Fri, 28 Dec 2018 19:33:15 +0100 Subject: [PATCH 4/6] Bugfix Bugfix according to https://github.com/HelloZeroNet/ZeroNet/issues/720#issuecomment-301506024 --- pixelflut/pixelflut.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixelflut/pixelflut.py b/pixelflut/pixelflut.py index 1f24751..caefe08 100755 --- a/pixelflut/pixelflut.py +++ b/pixelflut/pixelflut.py @@ -5,7 +5,7 @@ __version__ = '0.6' import time from gevent import spawn, sleep as gsleep, GreenletExit from gevent.socket import socket, SOL_SOCKET, SO_REUSEADDR -from gevent.coros import Semaphore, RLock +from gevent.lock import Semaphore, RLock from gevent.queue import Queue from collections import deque import pygame From 19fa340a30dd4f3675ba2e5d157a49c6b9371395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Lu=CC=88dtke?= Date: Sun, 30 Dec 2018 21:13:04 +0100 Subject: [PATCH 5/6] typos --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 41394c6..c549c02 100755 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Server written in Python, based on gevent and pygame. Easy to hack with, but a b #### `/pixelwar` (java server) -Server written in Java8, based on netty and awt. Optimized for speed and large player groups, fast networks or high resolution projectors. This is probably the most portable version and runs on windows, too. +Server written in Java8, based on netty and awt. Optimized for speed and large player groups, fast networks or high-resolution projectors. This is probably the most portable version and runs on windows, too. cd pixelwar sudo apt-get install maven openjdk-8-jdk @@ -60,7 +60,7 @@ or, if you have docker installed but don't want to install maven: #### `/pixelnuke` (C server) -Server written in C, based on libevent2, OpenGL, GLFW and pthreads. It won't get any faster than this. Prfect for fast networks and large groups. +Server written in C, based on libevent2, OpenGL, GLFW and pthreads. It won't get any faster than this. Perfect for fast networks and large groups. cd pixelnuke sudo apt-get install build-essential libevent-dev libglew-dev libglfw3-dev @@ -81,12 +81,12 @@ Additional Commands: * `conn:` Number of currently connected clients. Planned Features: -- [x] Toggle between windowed/fullscreen mode and switch monitors in fullscreen-mode. +- [x] Toggle between windowed/fullscreen mode and switch monitors in fullscreen mode. - [ ] Persist pixel buffer between restarts. Use an mmap-ed file for pixel data? - [ ] Save to PPM (via key, timer or admin command) and add docs/tools to convert these into a video. - [ ] Support to draw directly to a framebuffer (no OpenGL or X Server dependency -> Raspberry-PI compatible) - [ ] Showcase-Mode: Players won't draw at the same time, but take turns. Each player gets N seconds of exclusive draw time) -- [ ] Limit concurrent connections per IP. +- [ ] Limit concurrent connections on a per IP basis. - [ ] Admin commands: Unlock additional commands with a password (e.g. `PX2 ` to draw to the overlay layer) From 70174062e1dec09fc81aaca295a53fb578ebc2c0 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Sun, 27 Dec 2020 21:30:15 +0100 Subject: [PATCH 6/6] Fix typo ok, I might be missing something blindingly obvious, but shouldn't that 32 be a 23? --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c549c02..efbecf2 100755 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Example: $ echo "SIZE" | netcat pixelflut.example.com 1337 SIZE 800 600 $ echo "PX 23 42 ff8000" | netcat pixelflut.example.com 1337 - $ echo "PX 32 42" | netcat pixelflut.example.com 1337 + $ echo "PX 23 42" | netcat pixelflut.example.com 1337 PX 23 42 ff8000 Implementations MAY support additional commands or have less strict parsing rules (e.g. allow `\r\n` or any whitespace between parameters) but they MUST support the commands above.