jrtechs
/
jrtechs-Club-Panda
mirror of https://github.com/jrtechs/Club-Panda.git
1
0
Fork 0
Code Issues 0 Releases 0 Wiki Activity
Browse Source

Update to collision code

pull/1/head
jrtechs 7 years ago
parent
d1a8821219
commit
7495189694
12 changed files with 508 additions and 11 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +37
    -0
      RepoJS/README.md
  2. +5
    -0
      RepoJS/bower.json
  3. BIN
      RepoJS/fonts/repo.eot
  4. +18
    -0
      RepoJS/fonts/repo.svg
  5. BIN
      RepoJS/fonts/repo.ttf
  6. BIN
      RepoJS/fonts/repo.woff
  7. +296
    -0
      RepoJS/repo.js
  8. +29
    -0
      RepoJS/repo.min.js
  9. +3
    -2
      games/bamboofield.html
  10. +22
    -0
      games/bamboofield.php
  11. +85
    -6
      includes/header.php
  12. +13
    -3
      index.php

+ 37
- 0
RepoJS/README.md View File

@ -0,0 +1,37 @@
Repo.js
=======
[![Build Status](http://img.shields.io/travis/darcyclarke/Repo.js.svg?style=flat-square)](https://travis-ci.org/darcyclarke/Repo.js)
[![Dependency Status](https://david-dm.org/darcyclarke/repo.js/badges.svg?style=flat-square)](https://david-dm.org/darcyclarke/repo.js/badges)
[![devDependency Status](https://david-dm.org/darcyclarke/repo.js/badges/dev-status.svg?style=flat-square)](https://david-dm.org/darcyclarke/repo.js/badges#info=devDependencies)
[![Code Climate](http://img.shields.io/codeclimate/github/darcyclarke/Repo.js.svg?style=flat-square)](https://codeclimate.com/github/darcyclarke/Repo.js)
[![npm](https://img.shields.io/npm/v/repo.js.svg?maxAge=2592000&style=flat-square)](https://www.npmjs.com/package/repo.js)
[![npm](https://img.shields.io/npm/dt/repo.js.svg?maxAge=2592000&style=flat-square)](https://www.npmjs.com/package/repo.js)
[![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://darcyclarke.mit-license.org)
[![Join the chat at https://gitter.im/darcyclarke/Repo.js](http://img.shields.io/:Gitter-Join Chat-orange.svg?style=flat-square)](https://gitter.im/darcyclarke/Repo.js)
Repo.js is a jQuery plugin that lets you easily embed a Github repo onto your site. This is great for other plugin or library authors that want to showcase the contents of a repo on their project pages.
Repo.js uses [Markus Ekwall](https://twitter.com/#!/mekwall)'s [jQuery Vangogh](https://github.com/mekwall/jquery-vangogh) plugin for styling of file contents. Vangogh, subsequently, utilizes [highlight.js](https://github.com/isagalaev/highlight.js), written by [Ivan Sagalaev](https://github.com/isagalaev) for syntax highlighting.
##Example Usage
```javascript
$('body').repo({ user: 'darcyclarke', name: 'Repo.js' });
````
You can also reference a specific branch if you want:
```javascript
$('body').repo({ user: 'jquery', name: 'jquery', branch: 'strip_iife' });
````
##License
Copyright (c) 2016 Darcy Clarke <darcy@darcyclarke.me>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ 5
- 0
RepoJS/bower.json View File

@ -0,0 +1,5 @@
{
"name": "Repo.js",
"version": "1.0",
"main": "repo.js"
}

BIN
RepoJS/fonts/repo.eot View File


+ 18
- 0
RepoJS/fonts/repo.svg View File

@ -0,0 +1,18 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>
This is a custom SVG font generated by IcoMoon.
<iconset grid="16"></iconset>
</metadata>
<defs>
<font id="icomoon" horiz-adv-x="512" >
<font-face units-per-em="512" ascent="480" descent="-32" />
<missing-glyph horiz-adv-x="512" />
<glyph unicode="&#x66;" d="M 416.00,0.00L 512.00,256.00L 96.00,256.00L0.00,0.00 zM 64.00,288.00 L 0.00,0.00 L 0.00,416.00 L 144.00,416.00 L 208.00,352.00 L 416.00,352.00 L 416.00,288.00 Z" />
<glyph unicode="&#x74;" d="M 451.716,380.285l-71.432,71.431C 364.728,467.272, 334.00,480.00, 312.00,480.00L 72.00,480.00 C 50.00,480.00, 32.00,462.00, 32.00,440.00l0.00-432.00 c0.00-22.00, 18.00-40.00, 40.00-40.00l 368.00,0.00 c 22.00,0.00, 40.00,18.00, 40.00,40.00
L 480.00,312.00 C 480.00,334.00, 467.272,364.729, 451.716,380.285z M 429.089,357.657c 1.565-1.565, 3.125-3.487, 4.64-5.657L 352.00,352.00 L 352.00,433.728
c 2.17-1.515, 4.092-3.075, 5.657-4.64L 429.089,357.657z M 448.00,8.00c0.00-4.336-3.664-8.00-8.00-8.00L 72.00,0.00 c-4.336,0.00-8.00,3.664-8.00,8.00L 64.00,440.00 c0.00,4.336, 3.664,8.00, 8.00,8.00
l 240.00,0.00 c 2.416,0.00, 5.127-0.305, 8.00-0.852L 320.00,320.00 l 127.148,0.00 c 0.547-2.873, 0.852-5.583, 0.852-8.00L 448.00,8.00 z" />
<glyph class="hidden" unicode="&#xf000;" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
</font></defs></svg>

BIN
RepoJS/fonts/repo.ttf View File


BIN
RepoJS/fonts/repo.woff View File


+ 296
- 0
RepoJS/repo.js
File diff suppressed because it is too large
View File


+ 29
- 0
RepoJS/repo.min.js
File diff suppressed because it is too large
View File


+ 3
- 2
games/bamboofield.html View File

@ -61,7 +61,7 @@
this.width = 10; this.width = 10;
this.height = 10; this.height = 10;
this.speed = 6;
this.speed = 4;
this.facing = 40; this.facing = 40;
@ -100,7 +100,8 @@
if(bamboos[i] != -1) if(bamboos[i] != -1)
{ {
bb = bamboos[i]; bb = bamboos[i];
if(Math.abs(bb.x - p.x) <= bb.width)
//if(Math.abs(bb.x - p.x) <= bb.width)
if(p.x > bb.x && p.x < bb.x + bb.width || p.x + p.width < bb.x + bb.width && p.x + p.width > bb.x)
{ {
if(p.y > bb.y && p.y < bb.y + bb.height || p.y + p.height < bb.y + bb.height && p.y + p.height > bb.y) if(p.y > bb.y && p.y < bb.y + bb.height || p.y + p.height < bb.y + bb.height && p.y + p.height > bb.y)
{ {

+ 22
- 0
games/bamboofield.php View File

@ -0,0 +1,22 @@
<?php
$dir = 2;
//ini_set('display_errors', 1);
include '../includes/header.php';
echo '<br><div class="w3-row">
<div class="w3-twothird w3-container ">';
include('bamboofield.html');
echo '</div><div class="w3-third w3-container">';
//include('../includes/profile.php');
echo '</div>';
echo '</div>';
include '../includes/footer.php';
?>

+ 85
- 6
includes/header.php View File

@ -5,8 +5,15 @@
session_start(); session_start();
ob_start(); ob_start();
if($dir == 2)
{
require_once("../../club_connect.php");
}
else
{
require_once("../club_connect.php");
}
require_once("../club_connect.php");
if((md5($_SERVER['HTTP_USERAGENT'] . 'salt')) == ($_SESSION['agent']) && $_SESSION['use'] == true) if((md5($_SERVER['HTTP_USERAGENT'] . 'salt')) == ($_SESSION['agent']) && $_SESSION['use'] == true)
{ {
@ -38,9 +45,77 @@
<head> <head>
<title>Club Panda</title> <title>Club Panda</title>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="includes/w3.css">
<link rel="stylesheet" href="https://www.w3schools.com/lib/w3-theme-black.css">
<meta name="viewport" content="width=device-width, initial-scale=1">';
if($dir == 2)
{
echo '<!DOCTYPE html>
<html>
<head>
<title>Club Panda</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">';
echo '<link rel="stylesheet" href="../includes/w3.css">';
echo '<link rel="stylesheet" href="https://www.w3schools.com/lib/w3-theme-black.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
</head>
<body id="myPage">
<!-- Sidebar on click -->
<nav class="w3-sidebar w3-bar-block w3-white w3-card-2 w3-animate-left w3-xxlarge" style="display:none;z-index:2" id="mySidebar">
<a href="javascript:void(0)" onclick="w3_close()" class="w3-bar-item w3-button w3-display-topright w3-text-teal">Close
<i class="fa fa-remove"></i>
</a>
<a href="bamboofield.php" class="w3-bar-item w3-button">Bamboo Field</a>
<a href="#" class="w3-bar-item w3-button">Link 2</a>
<a href="#" class="w3-bar-item w3-button">Link 3</a>
<a href="#" class="w3-bar-item w3-button">Link 4</a>
<a href="#" class="w3-bar-item w3-button">Link 5</a>
</nav>
<!-- Navbar -->
<div class="w3-top">
<div class="w3-bar w3-theme-d2 w3-left-align">
<a class="w3-bar-item w3-button w3-hide-medium w3-hide-large w3-right w3-hover-white w3-theme-d2" href="javascript:void(0);" onclick="openNav()"><i class="fa fa-bars"></i></a>
<a href="#" class="w3-bar-item w3-button w3-teal"><i class="fa fa-home w3-margin-right"></i>Logo</a>
<a href="../index.php" class="w3-bar-item w3-button w3-hide-small w3-hover-white">Home</a>
<a href="../about.php" class="w3-bar-item w3-button w3-hide-small w3-hover-white">About</a>
<div class="w3-dropdown-hover w3-hide-small">
<button class="w3-button" title="Notifications">Games<i class="fa fa-caret-down"></i></button>
<div class="w3-dropdown-content w3-card-4 w3-bar-block">
<a href="bamboofield.php" class="w3-bar-item w3-button">Bamboo Field</a>
<a href="#" class="w3-bar-item w3-button">Link</a>
<a href="#" class="w3-bar-item w3-button">Link</a>
</div>
</div>
</div>
<!-- Navbar on small screens -->
<div id="navDemo" class="w3-bar-block w3-theme-d2 w3-hide w3-hide-large w3-hide-medium">
<a href="../index.php" class="w3-bar-item w3-button">Home</a>
<a href="../games.php" class="w3-bar-item w3-button">Games</a>
<a href="../about.php" class="w3-bar-item w3-button">About</a>
</div>
</div>
<!-- Image Header -->
<div class="w3-display-container w3-animate-opacity">
<img src="../includes/banner.png" alt="boat" style="width:100%;min-height:350px;">
</div>';
}
else
{
echo '<!DOCTYPE html>
<html>
<head>
<title>Club Panda</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">';
echo '<link rel="stylesheet" href="includes/w3.css">';
echo '<link rel="stylesheet" href="https://www.w3schools.com/lib/w3-theme-black.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
</head> </head>
@ -51,7 +126,7 @@
<a href="javascript:void(0)" onclick="w3_close()" class="w3-bar-item w3-button w3-display-topright w3-text-teal">Close <a href="javascript:void(0)" onclick="w3_close()" class="w3-bar-item w3-button w3-display-topright w3-text-teal">Close
<i class="fa fa-remove"></i> <i class="fa fa-remove"></i>
</a> </a>
<a href="#" class="w3-bar-item w3-button">Bamboo Field</a>
<a href="games/bamboofield.php" class="w3-bar-item w3-button">Bamboo Field</a>
<a href="#" class="w3-bar-item w3-button">Link 2</a> <a href="#" class="w3-bar-item w3-button">Link 2</a>
<a href="#" class="w3-bar-item w3-button">Link 3</a> <a href="#" class="w3-bar-item w3-button">Link 3</a>
<a href="#" class="w3-bar-item w3-button">Link 4</a> <a href="#" class="w3-bar-item w3-button">Link 4</a>
@ -68,7 +143,7 @@
<div class="w3-dropdown-hover w3-hide-small"> <div class="w3-dropdown-hover w3-hide-small">
<button class="w3-button" title="Notifications">Games<i class="fa fa-caret-down"></i></button> <button class="w3-button" title="Notifications">Games<i class="fa fa-caret-down"></i></button>
<div class="w3-dropdown-content w3-card-4 w3-bar-block"> <div class="w3-dropdown-content w3-card-4 w3-bar-block">
<a href="#" class="w3-bar-item w3-button">Bamboo Field</a>
<a href="games/bamboofield.php" class="w3-bar-item w3-button">Bamboo Field</a>
<a href="#" class="w3-bar-item w3-button">Link</a> <a href="#" class="w3-bar-item w3-button">Link</a>
<a href="#" class="w3-bar-item w3-button">Link</a> <a href="#" class="w3-bar-item w3-button">Link</a>
</div> </div>
@ -88,5 +163,9 @@
<img src="includes/banner.png" alt="boat" style="width:100%;min-height:350px;"> <img src="includes/banner.png" alt="boat" style="width:100%;min-height:350px;">
</div>'; </div>';
}
?> ?>

+ 13
- 3
index.php View File

@ -1,5 +1,5 @@
<?php <?php
//ini_set('display_errors', 1);
ini_set('display_errors', 1);
include 'includes/header.php'; include 'includes/header.php';
@ -17,7 +17,7 @@
echo '</div><div class="w3-half w3-container">'; echo '</div><div class="w3-half w3-container">';
//profile //profile
include('user/profile.php'); include('user/profile.php');
echo '</div></div>';
echo '</div>';
} }
else else
{ {
@ -32,9 +32,19 @@
echo '</div><div class="w3-half w3-container">'; echo '</div><div class="w3-half w3-container">';
//profile //profile
include('user/profile.php'); include('user/profile.php');
echo '</div></div>';
echo '</div>';
} }
//4-row
echo '<br><div class="w3-row w3-padding-32">';
echo '<div class="w3-half w3-container"><div style=\'position: relative; width: 100%; height: 0px; padding-bottom: 60%;\'">';
echo '<iframe src="https://www.youtube.com/embed/QhJYKBj3K08" frameborder="0" allowfullscreen style=\'position: absolute; left: 0px; top: 0px; width: 100%; height: 100%\'"></iframe>';
echo '</div></div>';
echo '<div class="w3-half w3-container"><div id="repo1">';
include('games/bamboofield.html');
echo '</div></div></div>';
include 'includes/footer.php'; include 'includes/footer.php';
?> ?>

Write Preview
Loading…
Cancel
Save