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: greggman/HappyFunTimes
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.0.46
Choose a base ref
...
head repository: greggman/HappyFunTimes
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Feb 12, 2016

  1. bump to 0.0.46

    greggman committed Feb 12, 2016
    Copy the full SHA
    5f54847 View commit details

Commits on Mar 22, 2016

  1. Copy the full SHA
    5805277 View commit details

Commits on Mar 24, 2016

  1. update docs

    greggman committed Mar 24, 2016
    Copy the full SHA
    d9e5001 View commit details

Commits on Apr 20, 2016

  1. add lang hack

    greggman committed Apr 20, 2016
    Copy the full SHA
    db222ca View commit details

Commits on May 21, 2016

  1. Copy the full SHA
    8f42db0 View commit details
  2. make server listen on ip6

    greggman committed May 21, 2016
    Copy the full SHA
    df18f26 View commit details

Commits on May 22, 2016

  1. bump to 0.0.47

    greggman committed May 22, 2016
    Copy the full SHA
    bd452b5 View commit details
  2. lint

    greggman committed May 22, 2016
    Copy the full SHA
    8ff2b10 View commit details
  3. add fd00 as ignoreed segment

    greggman committed May 22, 2016
    Copy the full SHA
    540d611 View commit details
  4. try both ipv6 and ipv4

    greggman committed May 22, 2016
    Copy the full SHA
    d871fed View commit details
  5. Copy the full SHA
    071e0a6 View commit details

Commits on May 23, 2016

  1. include fc00 ip6 addresses as supposedly those are internal addreses …

    …which is really all we care about though no one seems to have one
    greggman committed May 23, 2016
    Copy the full SHA
    9a1080e View commit details
  2. update changelist

    greggman committed May 23, 2016
    Copy the full SHA
    ed0dbdc View commit details
  3. update docs

    greggman committed May 23, 2016
    Copy the full SHA
    e4f3fe5 View commit details

Commits on May 24, 2016

  1. update docs

    greggman committed May 24, 2016
    Copy the full SHA
    e81a789 View commit details

Commits on May 25, 2016

  1. update docs

    greggman committed May 25, 2016
    Copy the full SHA
    8f65bbd View commit details
  2. Copy the full SHA
    24edbc8 View commit details

Commits on May 31, 2016

  1. Copy the full SHA
    290b5d7 View commit details
  2. Copy the full SHA
    dd5e784 View commit details
  3. Copy the full SHA
    bfd9604 View commit details
  4. lint

    greggman committed May 31, 2016
    Copy the full SHA
    bbf6ecf View commit details
  5. Copy the full SHA
    35c866d View commit details
  6. bump to v0.0.48

    greggman committed May 31, 2016
    Copy the full SHA
    0943ae8 View commit details

Commits on Jun 1, 2016

  1. Copy the full SHA
    5b01870 View commit details
  2. use ipaddress as session id

    greggman committed Jun 1, 2016
    Copy the full SHA
    035cef4 View commit details
  3. Copy the full SHA
    fbeca31 View commit details
  4. lint

    greggman committed Jun 1, 2016
    Copy the full SHA
    87b2562 View commit details
  5. Copy the full SHA
    5d971f2 View commit details

Commits on Jun 4, 2016

  1. make captive-portal use ip address as session id

    I feel like i might need to time these out
    greggman committed Jun 4, 2016
    Copy the full SHA
    aad24f3 View commit details
  2. update docs

    greggman committed Jun 4, 2016
    Copy the full SHA
    5270bd7 View commit details
  3. update docs

    greggman committed Jun 4, 2016
    Copy the full SHA
    321a16a View commit details

Commits on Jun 5, 2016

  1. more docs

    greggman committed Jun 5, 2016
    Copy the full SHA
    df377a7 View commit details

Commits on Jun 21, 2016

  1. fix typo

    greggman committed Jun 21, 2016
    Copy the full SHA
    8058213 View commit details

Commits on Jun 27, 2016

  1. add android stuff

    greggman committed Jun 27, 2016
    Copy the full SHA
    329522b View commit details

Commits on Nov 8, 2016

  1. Optimize the basic CSS for the docs

    * Updates Bootstrap styles to the latest version
    * Increases the base font size to 18px
    * Unifies the fonts across all docs
    * Switches to a modern theme for Code Prettify
    Kovah committed Nov 8, 2016
    Copy the full SHA
    eee0342 View commit details
  2. Updates the docs

    * Fixes several spelling issues
    * Fixes several code issues which led to a broken HTML page
    * Updates some parts with new information
      * Adds information about CSS viewport units
      * Updates information about media queries for devices
    * Removes some strong language from the docs
    Kovah committed Nov 8, 2016
    Copy the full SHA
    5a5fabc View commit details
  3. Copy the full SHA
    a49e683 View commit details
  4. Updates the Unity docs

    * Fixes several spelling issues
    * Fixes several code issues which led to a broken HTML page
    Kovah committed Nov 8, 2016
    Copy the full SHA
    5950882 View commit details
  5. Copy the full SHA
    5953517 View commit details

Commits on Nov 9, 2016

  1. Merge pull request #21 from Kovah/better-css

    Optimize the basic CSS for the docs
    greggman authored Nov 9, 2016
    Copy the full SHA
    6b75e82 View commit details
  2. Merge pull request #22 from Kovah/better-docs

    Update the docs
    greggman authored Nov 9, 2016
    Copy the full SHA
    e2be955 View commit details

Commits on Nov 17, 2016

  1. Replaces Prettify with highlight.js and makes jQuery, require.js comp…

    …iled by Grunt
    
    (highlight.js is actively maintained but needs to be downloaded as a precompiled package)
    Kovah committed Nov 17, 2016
    Copy the full SHA
    63b2d60 View commit details
  2. Copy the full SHA
    c3f0a6d View commit details
  3. Copy the full SHA
    728d28b View commit details
  4. Copy the full SHA
    6c35f3c View commit details

Commits on Nov 18, 2016

  1. Merge pull request #25 from Kovah/renew-docs

    Renew of the documentation Pt.2
    greggman authored Nov 18, 2016
    Copy the full SHA
    8d07d0b View commit details
  2. remove generated html files

    greggman committed Nov 18, 2016
    Copy the full SHA
    288bd00 View commit details
  3. add missing dependency

    greggman committed Nov 18, 2016
    Copy the full SHA
    12435a0 View commit details
  4. Copy the full SHA
    a57da75 View commit details
  5. remove generated .html files

    greggman committed Nov 18, 2016
    Copy the full SHA
    c877e8e View commit details
Showing 398 changed files with 8,440 additions and 37,338 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -3,6 +3,10 @@ public/games
public/examples
docs/hft
docs/relayserver
docs/**/*.html
!docs/**/toc.html
!docs/unity/install.html
!docs/unity/samples.html
images/src
.DS_Store
*~
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
sudo: false
language: node_js
node_js:
- "4.1"
- "6"
script:
- grunt eslint
- npm run check
- npm run build
- npm test

before_install: npm install -g grunt-cli
77 changes: 73 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -33,11 +33,48 @@ module.exports = function(grunt) {
'docs/dotnet',
],
},
sass: {
docs: {
options: {
sourceMap: true,
outputStyle: 'compressed',
},
files: [{
expand: true,
cwd: 'docs/assets/scss',
dest: 'docs/assets/css',
src: ['**/*.scss'],
ext: '.css',
}]
},
},
uglify: {
docs_js: {
files: {
'docs/assets/3rdparty/jquery.js': ['node_modules/jquery/dist/jquery.min.js'],
'docs/assets/3rdparty/require.js': ['node_modules/requirejs/require.js'],
},
},
},
watch: {
docs_sass: {
files: ['docs/assets/scss/**/*.scss'],
tasks: ['sass:docs'],
options: {
spawn: false,
},
},
docs_md: {
files: ['docs/**/*.md', 'docs/**/toc.html'],
tasks: ['builddocs'],
options: {
spawn: false,
},
},
},
eslint: {
target: [
'cli',
'lib',
'management',
'public',
'server',
'test',
@@ -51,10 +88,14 @@ module.exports = function(grunt) {
});

grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-jsdoc');
grunt.loadNpmTasks('grunt-eslint');
grunt.loadNpmTasks('grunt-sass');

// WIP!!!
// Docs
grunt.registerTask('unitydocsgen', function() {
var done = this.async();
var foo = require('./dev/js/dotnetdocs');
@@ -71,6 +112,16 @@ module.exports = function(grunt) {
{
filespec: "docs/*.md",
},
{
filespec: "docs/making-games/*.md",
mainURL: "/docs/making-games",
toc: "docs/making-games/toc.html",
},
{
filespec: "docs/setup/*.md",
mainURL: "/docs/setup",
toc: "docs/setup/toc.html",
},
{
filespec: "docs/unity/*.md",
mainURL: "/docs/unity",
@@ -92,6 +143,24 @@ module.exports = function(grunt) {
});
});

grunt.registerTask('default', ['eslint', 'clean:docs', 'jsdoc']);
grunt.registerTask('docsassets', [
'sass:docs',
'uglify:docs_js',
]);

grunt.registerTask('docsdev', [
'clean:docs',
'builddocs',
'docsassets',
'watch',
]);

grunt.registerTask('docsbuild', [
'clean:docs',
'builddocs',
'docsassets',
]);

grunt.registerTask('default', ['eslint', 'docsbuild']);
};

82 changes: 69 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,77 @@
HappyFunTimes
=============

> ## **DEPRECATED**
>
> I'm deprecating happyfuntimes. I'll keep the rendevous server running for a while
> longer but I think it's unfortunately time to mostly depreciate this project
>
> i'll consider accepting PRs still if you want to fix something but otherwise just
> fork it if you want to keep using it
>
> ## Issues
>
> There are a few major issues on why
>
> 1. **device orientation is no longer usable**
>
> Both Safari and Chrome have made getting device orientation require HTTPS
> which is something HFT can't provide at the moment. It would require
> $$$$$$$. If a end-user friendly solution comes up maybe I'll revisit
>
> 2. **Browsers break stuff**
>
> Every year or so a browser changes something or breaks something. Over the course
> of HTF browser broke fullscreen support, audio support, touch support, orientation support,
> and other things. It's no fun to keep up on that
>
> 3. **OSes break stuff**
>
> For whatever reason networking that work before stops working. HFT has to do
> some things to find out all the ways your phone might connect to the game
> and that stuff seems to break every 2 years or so
>
> 4. **Offline Support breaks**
>
> Using HFT without internet breaks every few year and will likely eventually
> be unfixable. Both iOS and Android ping Apple and Google respectively when you
> connect to WiFi to check if you're acutally on the internet. HFT tries to send
> them *fake* data so they believe they are, otherwise they'll stop using the WiFi
> and switch to mobile.
>
> How they do this changes every few years so HFT has to figure out how to change its
> faking. It is within Apple and Google's power to make this faking impossible and
> I supsect they might at sometime which is scary because if they do then there is
> no solution (well, short of acutally providing internet access)
>
> 5. **More browser features require HTTPS**
>
> This is really #1 and #2 repeated but more and more browser features require HTTPS
> and as it says above there is no way for hft to provide HTTPS at the moment.
>
> ## Good news
>
> If you don't need device orientation and you have no need for offline mode/installation mode
> then HFT still works. Write your own controllers to keep up to date with the latest changes
> in the browsers.
>
> ## Bad news
>
> I don't really have time to keep it running.
[![Build Status](https://travis-ci.org/greggman/HappyFunTimes.svg?branch=master)](https://travis-ci.org/greggman/HappyFunTimes)
# Want to play?
* [Install HappyFunTimes](http://docs.happyfuntimes.net/install.html)
* [Try a few examples](https://itch.io/games/tag-happyfuntimes)
# Make games with Unity?
* [Getting Started with Unity](http://docs.happyfuntimes.net/docs/unity/getting-started.html)
# Make games with HTML5?
* [Get started with a single line script](http://greggman.github.io/hft-gamepad-api)
* [Make custom controllers](makking-games.md)
* [Making games](docs/making-games/index.md)
# Docs
@@ -28,34 +85,33 @@ HappyFunTimes
# Support
* [Developer Mailing List](https://groups.google.com/d/forum/hft-dev)
* [Blog](http://blog.happyfuntimes.net)
* [Facebook Group](https://www.facebook.com/groups/timesfunhappy/)
<img id="test" src="images/scene-00-jumpjump.jpg" width="782" height="441" />
<img id="test" src="http://docs.happyfuntimes.net/images/scene-00-jumpjump.jpg" width="782" height="441" />
[HappyFunTimes](http://greggman.github.io/HappyFunTimes/) is a system for playing party games that are meant to be
played with a bunch of people in the same room and 1 ideally large display.
<img id="test" src="images/scene-04-boomboom.jpg" width="782" height="441" />
<img id="test" src="http://docs.happyfuntimes.net/images/scene-04-boomboom.jpg" width="782" height="441" />
People participate in the game using their smartphone by going to a webpage
provided by the game. The webpage lets them use their phone as a controller.
This lets you make games that support more than the typical 4 players.
<img id="test" src="images/scene-01-powpow.jpg" width="782" height="441" />
<img id="test" src="http://docs.happyfuntimes.net/images/scene-01-powpow.jpg" width="782" height="441" />
I suppose theoretically there's no limit to the number of players.
<img id="test" src="images/400-player-bombbomb.jpg" width="782" height="441" />
<img id="test" src="http://docs.happyfuntimes.net/images/400-player-bombbomb.jpg" width="782" height="441" />
It also lets you make games with unique controllers.
<img id="test" src="images/scene-02-jamjam.jpg" width="782" height="441" />
<img id="test" src="http://docs.happyfuntimes.net/images/scene-02-jamjam.jpg" width="782" height="441" />
There's a Unity3D library if you'd like to make the game in Unity3D.
<img id="test" src="images/scene-03-unity.jpg" width="782" height="441" />
<img id="test" src="http://docs.happyfuntimes.net/images/scene-03-unity.jpg" width="782" height="441" />
* The smartphones end up just being smart controllers.
@@ -169,10 +225,10 @@ There's a Unity3D library if you'd like to make the game in Unity3D.
Just like `NetPlayer` above we can listen for events.
client.addEventListener('score', handleScore);
client.addEventListener('die', handleDie);
function handleScore(data) {
console.log("you got " + data.points + " points");
function handleDie(data) {
console.log("you lost", data.pointsToLose, "points. Reason:", data.reason);
}
Similarly you can send events to the game
61 changes: 0 additions & 61 deletions cli/cmds/add.js

This file was deleted.

Loading