Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Webrtc merge #38

Open
wants to merge 85 commits into
base: master
Choose a base branch
from
Open

Webrtc merge #38

wants to merge 85 commits into from

Commits on Jan 13, 2013

  1. WebRTC support.

    Alan Kligman committed Jan 13, 2013
    Configuration menu
    Copy the full SHA
    32aaa60 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2013

  1. Added remote URL div to game page.

    Alan Kligman committed Jan 16, 2013
    Configuration menu
    Copy the full SHA
    b642e8b View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2013

  1. Minor updates to support WebRTC peer connection.

    Alan Kligman committed Jan 25, 2013
    Configuration menu
    Copy the full SHA
    935d64d View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2013

  1. Updated to support new webrtc sockets.

    Alan Kligman committed Jan 30, 2013
    Configuration menu
    Copy the full SHA
    d20f53d View commit details
    Browse the repository at this point in the history

  2. Added build output.

    Alan Kligman committed Jan 30, 2013
    Configuration menu
    Copy the full SHA
    d570815 View commit details
    Browse the repository at this point in the history

  3. Revert "Added build output." 

    This reverts commit d570815.
    Alan Kligman committed Jan 30, 2013
    Configuration menu
    Copy the full SHA
    ece3924 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2013

  1. Automatic serve and debug.

    Alan Kligman committed Jan 31, 2013
    Configuration menu
    Copy the full SHA
    4833dce View commit details
    Browse the repository at this point in the history

  2. Added auto-connect to low map.

    Alan Kligman committed Jan 31, 2013
    Configuration menu
    Copy the full SHA
    e6620c3 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2013

  1. Added new multiplayer map.

    Alan Kligman committed Feb 6, 2013
    Configuration menu
    Copy the full SHA
    296b003 View commit details
    Browse the repository at this point in the history

  2. Added new (multiplayer) map.

    Alan Kligman committed Feb 6, 2013
    Configuration menu
    Copy the full SHA
    c7d91b7 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2013

  1. Testing for 'webrtc-session' instead of 'join' to determine host/peer… 

    … status.
    Alan Kligman committed Feb 8, 2013
    Configuration menu
    Copy the full SHA
    151bf20 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2013

  1. Added a multiplayer join page (for server listing).

    Alan Kligman committed Feb 11, 2013
    Configuration menu
    Copy the full SHA
    6236a2d View commit details
    Browse the repository at this point in the history

  2. Updated web interface.

    Alan Kligman committed Feb 11, 2013
    Configuration menu
    Copy the full SHA
    bd25723 View commit details
    Browse the repository at this point in the history

  3. Updated to use long polling.

    Alan Kligman committed Feb 11, 2013
    Configuration menu
    Copy the full SHA
    e86c3ca View commit details
    Browse the repository at this point in the history

  4. Added some text to the join page.

    Alan Kligman committed Feb 11, 2013
    Configuration menu
    Copy the full SHA
    0d2822c View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2013

  1. Updated new multiplayer map. package.cfg files are not optimized, so … 

    …the bundle is slightly large.
    Alan Kligman committed Feb 12, 2013
    Configuration menu
    Copy the full SHA
    98e06e7 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2013

  1. Updated default connect port.

    Alan Kligman committed Feb 21, 2013
    Configuration menu
    Copy the full SHA
    6aaa657 View commit details
    Browse the repository at this point in the history

  2. Added list.html to replace join.html.

    Alan Kligman committed Feb 21, 2013
    Configuration menu
    Copy the full SHA
    0a5a2eb View commit details
    Browse the repository at this point in the history

  3. Removed join.html.

    Alan Kligman committed Feb 21, 2013
    Configuration menu
    Copy the full SHA
    82cb26a View commit details
    Browse the repository at this point in the history

  4. Remove pause when exiting fullscreen. This causes networking code to … 

    …hang and break in-game connections.
    Alan Kligman committed Feb 21, 2013
    Configuration menu
    Copy the full SHA
    0b7fc04 View commit details
    Browse the repository at this point in the history

  5. Updated listing code.

    Alan Kligman committed Feb 21, 2013
    Configuration menu
    Copy the full SHA
    353aa65 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2013

  1. Updated level assets and Makefile.

    Alan Kligman committed Mar 4, 2013
    Configuration menu
    Copy the full SHA
    9012bb5 View commit details
    Browse the repository at this point in the history

  2. Added bunker.

    Alan Kligman committed Mar 4, 2013
    Configuration menu
    Copy the full SHA
    fa0ee8d View commit details
    Browse the repository at this point in the history

  3. Updated new map. Added debug flags to other maps so they will run.

    Alan Kligman committed Mar 4, 2013
    Configuration menu
    Copy the full SHA
    444f746 View commit details
    Browse the repository at this point in the history

  4. Removed connection limit from server list.

    Alan Kligman committed Mar 4, 2013
    Configuration menu
    Copy the full SHA
    4419cca View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2013

  1. Update gitignore to leave build output.

    Alan Kligman committed Mar 5, 2013
    Configuration menu
    Copy the full SHA
    820fa00 View commit details
    Browse the repository at this point in the history

  2. Fixed a formatting issue.

    Alan Kligman committed Mar 5, 2013
    Configuration menu
    Copy the full SHA
    23734d6 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2013

  1. Added a new map. Increased TOTAL_MEMORY (new map is biiiig).

    Alan Kligman committed Mar 13, 2013
    Configuration menu
    Copy the full SHA
    e2a0193 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2013

  1. Updated maps.

    Alan Kligman committed Mar 15, 2013
    Configuration menu
    Copy the full SHA
    603c446 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2013

  1. Merge branch 'master' into experimental-webrtc-support-merge 

    Conflicts:
	cube2/game/setup_low.js
	cube2/js/game-setup.js
	cube2/src/web/Makefile
    Alan Kligman committed Mar 16, 2013
    Configuration menu
    Copy the full SHA
    d1f8b0e View commit details
    Browse the repository at this point in the history

  2. Updated maps and waypoints.

    Alan Kligman committed Mar 16, 2013
    Configuration menu
    Copy the full SHA
    7f073fe View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2013

  1. Added missing assets to Makefile. Refactoring game-setup.

    Alan Kligman committed Mar 17, 2013
    Configuration menu
    Copy the full SHA
    0431def View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2013

  1. Removing new assets.

    Alan Kligman committed Mar 18, 2013
    Configuration menu
    Copy the full SHA
    7583022 View commit details
    Browse the repository at this point in the history

  2. Updated game files.

    Alan Kligman committed Mar 18, 2013
    Configuration menu
    Copy the full SHA
    af35f0d View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2013

  1. Merge branch 'master' into experimental-webrtc-support-merge

    Alan Kligman committed Mar 19, 2013
    Configuration menu
    Copy the full SHA
    3432042 View commit details
    Browse the repository at this point in the history

  2. Memory is now a power of 2. Updated water effects in multiplayer maps.

    Alan Kligman committed Mar 19, 2013
    Configuration menu
    Copy the full SHA
    2ab1f05 View commit details
    Browse the repository at this point in the history

  3. Switched back to effic for now. Added health pickup assets from gk.

    Alan Kligman committed Mar 19, 2013
    Configuration menu
    Copy the full SHA
    95a8f19 View commit details
    Browse the repository at this point in the history

  4. Updated maps, added some smaller ones. Maps 6 and 10 have been reconf… 

    …igured.
    Alan Kligman committed Mar 19, 2013
    Configuration menu
    Copy the full SHA
    f039580 View commit details
    Browse the repository at this point in the history

  5. Updated Makefile.

    Alan Kligman committed Mar 19, 2013
    Configuration menu
    Copy the full SHA
    9018dcf View commit details
    Browse the repository at this point in the history

  6. Ignore output directory.

    Alan Kligman committed Mar 19, 2013
    Configuration menu
    Copy the full SHA
    de20c25 View commit details
    Browse the repository at this point in the history

  7. Updated matchmaking list and screenshots (from secretrobotron).

    Alan Kligman committed Mar 19, 2013
    Configuration menu
    Copy the full SHA
    f86db4d View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2013

  1. DS_Store in gitignore and loading screenshots

    @secretrobotron
    secretrobotron committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    5582f92 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from secretrobotron/experimental-webrtc-support… 

    …-merge

DS_Store in gitignore and loading screenshots
    Alan Kligman committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    0d2fb09 View commit details
    Browse the repository at this point in the history

  3. Updated new map descriptions.

    Alan Kligman committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    1c4ef5f View commit details
    Browse the repository at this point in the history

  4. removed levels from index

    @secretrobotron
    secretrobotron committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    03d0421 View commit details
    Browse the repository at this point in the history

  5. Updated main page.

    Alan Kligman committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    b0dffba View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'secretrobotron/experimental-webrtc-supp… 

    …ort-merge' into experimental-webrtc-support-merge

Conflicts:
	cube2/index.html
    Alan Kligman committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    75124be View commit details
    Browse the repository at this point in the history

  7. Updated map list. Disabled some webrtc checks so you can still play s… 

    …ingleplayer on the multiplayer maps.
    Alan Kligman committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    2057340 View commit details
    Browse the repository at this point in the history

  8. Updated builds for older maps.

    Alan Kligman committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    2c38d3d View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2013

  1. Removing some of the maps from the list.

    Alan Kligman committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    7b7b698 View commit details
    Browse the repository at this point in the history

  2. Updated source to move webrtc config into bananabread code. Updated p… 

    …ublish script.
    Alan Kligman committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    73f0abf View commit details
    Browse the repository at this point in the history

  3. Added some automated publishing. Script will package essential files … 

    …for bananabread.
    Alan Kligman committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    742d136 View commit details
    Browse the repository at this point in the history

  4. Split out textures into their own data files to conserve space. Updat… 

    …ed game-setup to have preload and texture lists.
    Alan Kligman committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    4f8aade View commit details
    Browse the repository at this point in the history

  5. Updated colony map.

    Alan Kligman committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    b538daf View commit details
    Browse the repository at this point in the history

  6. Removed cyber map from manifest.

    Alan Kligman committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    500706a View commit details
    Browse the repository at this point in the history

  7. Fixed broken setup_low.

    Alan Kligman committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    b4da3ac View commit details
    Browse the repository at this point in the history

  8. Updated to use optimized assets. Will need to add source assets back … 

    …later.
    Alan Kligman committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    c9ea68b View commit details
    Browse the repository at this point in the history

  9. Disabled maps with broken textures.

    Alan Kligman committed Mar 21, 2013
    Configuration menu
    Copy the full SHA
    65b8b03 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2013

  1. Disabled colos and two towers, as they have busted textures. Fixed br… 

    …oken sky in ruins. Update sky with fixed spawn points. Removed some extraneous files. Re-ordered level packages to avoid putting binary files at the start (since they are incorrectly identified with the wrong MIME type by the demo website).
    Alan Kligman committed Mar 22, 2013
    Configuration menu
    Copy the full SHA
    786675a View commit details
    Browse the repository at this point in the history

  2. Updated level text.

    Alan Kligman committed Mar 22, 2013
    Configuration menu
    Copy the full SHA
    663885b View commit details
    Browse the repository at this point in the history

  3. Fixed wrongly-scaled textures for Arena and Two Towers.

    Alan Kligman committed Mar 22, 2013
    Configuration menu
    Copy the full SHA
    511e9c2 View commit details
    Browse the repository at this point in the history

  4. Re-listed Arena and Two Towers.

    Alan Kligman committed Mar 22, 2013
    Configuration menu
    Copy the full SHA
    13f4d0e View commit details
    Browse the repository at this point in the history

  5. Added a copy of socket.io.js to the project.

    Alan Kligman committed Mar 22, 2013
    Configuration menu
    Copy the full SHA
    1afa2ea View commit details
    Browse the repository at this point in the history

  6. Fixed issues with non-SSL broker and demo site.

    Alan Kligman committed Mar 22, 2013
    Configuration menu
    Copy the full SHA
    da5d9e9 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2013

  1. Updated assets for future textureset.

    Alan Kligman committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    e939e6b View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2013

  1. Add detection for multiplayer support. Shouldn't try to host or join … 

    …if not supported.
    Alan Kligman committed Mar 26, 2013
    Configuration menu
    Copy the full SHA
    2be5dba View commit details
    Browse the repository at this point in the history

  2. Updated textures.

    Alan Kligman committed Mar 26, 2013
    Configuration menu
    Copy the full SHA
    65ac789 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2013

  1. Updated list to add URL filtering.

    Alan Kligman committed Mar 28, 2013
    Configuration menu
    Copy the full SHA
    108b9a2 View commit details
    Browse the repository at this point in the history

  2. Remove hardcoded app URL. Derp.

    Alan Kligman committed Mar 28, 2013
    Configuration menu
    Copy the full SHA
    bb02481 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2013

  1. Add filter-url query parameter.

    Alan Kligman committed Mar 29, 2013
    Configuration menu
    Copy the full SHA
    0cfd6ab View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2013

  1. Merge remote-tracking branch 'upstream/master' into experimental-webr… 

    …tc-support-merge

Conflicts:
	cube2/src/web/Makefile
    Alan Kligman committed Apr 4, 2013
    Configuration menu
    Copy the full SHA
    428651b View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2013

  1. Moving code out of library.js.

    Alan Kligman committed Apr 12, 2013
    Configuration menu
    Copy the full SHA
    67a1ba1 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into experimental-webr… 

    …tc-support

Conflicts:
	cube2/js/game-setup.js
	cube2/src/web/Makefile
    Alan Kligman committed Apr 12, 2013
    Configuration menu
    Copy the full SHA
    09c2cac View commit details
    Browse the repository at this point in the history

  3. Add some multiplayer logic to game-setup. Update manifest.

    Alan Kligman committed Apr 12, 2013
    Configuration menu
    Copy the full SHA
    583ed18 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2013

  1. Cache flag.

    Alan Kligman committed May 7, 2013
    Configuration menu
    Copy the full SHA
    e06507c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into experimental-webrtc-support-merge

    Alan Kligman committed May 7, 2013
    Configuration menu
    Copy the full SHA
    41c14f3 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2013

  1. Enable SOCKET_WEBRTC.

    Alan Kligman committed May 14, 2013
    Configuration menu
    Copy the full SHA
    9b614de View commit details
    Browse the repository at this point in the history

  2. Ignore build output.

    Alan Kligman committed May 14, 2013
    Configuration menu
    Copy the full SHA
    c842094 View commit details
    Browse the repository at this point in the history

  3. Revert gitignore.

    Alan Kligman committed May 14, 2013
    Configuration menu
    Copy the full SHA
    1545c89 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2013

  1. Merge branch 'master' into experimental-webrtc-support-merge 

    Conflicts:
	cube2/src/web/Makefile
    Alan Kligman committed Jun 5, 2013
    Configuration menu
    Copy the full SHA
    03e89a5 View commit details
    Browse the repository at this point in the history

  2. Ignore .bc files

    Alan Kligman committed Jun 5, 2013
    Configuration menu
    Copy the full SHA
    3e588d4 View commit details
    Browse the repository at this point in the history

  3. Remove .bc file

    Alan Kligman committed Jun 5, 2013
    Configuration menu
    Copy the full SHA
    ea3ee12 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2013

  1. Flag fixes.

    Alan Kligman committed Jun 6, 2013
    Configuration menu
    Copy the full SHA
    95568b7 View commit details
    Browse the repository at this point in the history

  2. Remove build output.

    Alan Kligman committed Jun 6, 2013
    Configuration menu
    Copy the full SHA
    815e65a View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2013

  1. Merge branch 'master' into master-merge 

    Conflicts:
	cube2/src/web/Makefile
    Alan Kligman committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    a892468 View commit details
    Browse the repository at this point in the history