Skip to content

Commit

Permalink
Merge branch 'hotfix/gorilla'
Browse files Browse the repository at this point in the history
  • Loading branch information
@alessandro-aglietti
alessandro-aglietti committed Jan 19, 2014
2 parents 27adb78 + 54e731c commit 56b974b
Show file tree
Hide file tree
Showing 31 changed files with 32,358 additions and 1 deletion.
67 changes: 67 additions & 0 deletions games/games-war/src/main/webapp/3d.html
View file
@@ -0,0 +1,67 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">

<title>Bootstrap 101 Template</title>

<!-- Bootstrap -->
<link href="static/bootstrap/css/bootstrap.min.css" rel="stylesheet">

<!-- Custom styles for this template -->
<link href="static/css/starter-template.css" rel="stylesheet">

<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->

<script type="text/javascript" src="https://www.google.com/jsapi"></script>

<script src="static/js/3d.js"></script>
</head>
<body>
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse"
data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span> <span
class="icon-bar"></span> <span class="icon-bar"></span> <span
class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Open Data Games</a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li><a href="index.html">Home</a></li>
<li><a href="about.html">About</a></li>
<li><a href="game.html">Game</a></li>
<li class="active"><a href="3d.html">3D</a></li>
</ul>
</div>
<!--/.nav-collapse -->
</div>
</div>

<div>
<div style="height: 400px; width: 600px;" id="map3d"></div>
</div>

<div style="position: absolute; bottom: 10px; left: 5px; overflow: scroll; max-height: 210px;">
<ul id="events" class="list-group">
</ul>
</div>

<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="static/jquery/jquery-1.10.2.min.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="static/bootstrap/js/bootstrap.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions games/games-war/src/main/webapp/about.html
View file
Expand Up @@ -39,6 +39,7 @@
<li><a href="index.html">Home</a></li>
<li class="active"><a href="about.html">About</a></li>
<li><a href="game.html">Game</a></li>
<li><a href="3d.html">3D</a></li>
</ul>
</div>
<!--/.nav-collapse -->
Expand Down
1 change: 1 addition & 0 deletions games/games-war/src/main/webapp/game.html
View file
Expand Up @@ -42,6 +42,7 @@
<li><a href="index.html">Home</a></li>
<li><a href="about.html">About</a></li>
<li class="active"><a href="game.html">Game</a></li>
<li><a href="3d.html">3D</a></li>
</ul>
</div>
<!--/.nav-collapse -->
Expand Down
1 change: 1 addition & 0 deletions games/games-war/src/main/webapp/index.html
View file
Expand Up @@ -39,6 +39,7 @@
<li class="active"><a href="index.html">Home</a></li>
<li><a href="about.html">About</a></li>
<li><a href="game.html">Game</a></li>
<li><a href="3d.html">3D</a></li>
</ul>
</div>
<!--/.nav-collapse -->
Expand Down
58 changes: 58 additions & 0 deletions games/games-war/src/main/webapp/static/3d/U-Boat_Type_XXIII/doc.kml
View file
@@ -0,0 +1,58 @@
<?xml version='1.0' encoding='UTF-8'?>
<kml xmlns='http://earth.google.com/kml/2.1'>
<Folder>
<name>U-Boat Type XXIII</name>
<description><![CDATA[Created with <a href="http://sketchup.google.com/">Google SketchUp 6.0.515</a>]]></description>
<DocumentSource>SketchUp</DocumentSource>
<visibility>1</visibility>
<LookAt>
<heading>311.652</heading>
<tilt>79.4438</tilt>
<latitude>40.01695784983444</latitude>
<longitude>-105.2828638398491</longitude>
<range>45.91482238691446</range>
<altitude>8.507978280071193</altitude>
</LookAt>
<Folder>
<name>Tour</name>
<Placemark>
<name>Inverse</name>
<visibility>1</visibility>
<LookAt>
<heading>311.652</heading>
<tilt>79.4438</tilt>
<latitude>40.01695784983444</latitude>
<longitude>-105.2828638398491</longitude>
<range>45.91482238691446</range>
<altitude>8.507978280071193</altitude>
</LookAt>
</Placemark>
</Folder>
<Placemark>
<name>Model</name>
<description><![CDATA[]]></description>
<Style id='default'>
</Style>
<Model>
<altitudeMode>relativeToGround</altitudeMode>
<Location>
<longitude>-105.283000000000</longitude>
<latitude>40.017000000000</latitude>
<altitude>0.000000000000</altitude>
</Location>
<Orientation>
<heading>0</heading>
<tilt>0</tilt>
<roll>0</roll>
</Orientation>
<Scale>
<x>1.0</x>
<y>1.0</y>
<z>1.0</z>
</Scale>
<Link>
<href>models/U-Boat Type XXIII.dae</href>
</Link>
</Model>
</Placemark></Folder>
</kml>
Binary file added games/games-war/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Color_008_1.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s-war/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Color_008noCulling.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...games-war/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/I19cascosub1_1.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ar/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/I19cascosub1noCulling.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...mes-war/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Interior_Texture.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...c/main/webapp/static/3d/U-Boat_Type_XXIII/images/Interior_Texture1noCulling.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s-war/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Material2noCulling.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s-war/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Material3noCulling.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s-war/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Material6noCulling.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added games/games-war/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Material7.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...war/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Metal_RoughnoCulling.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...war/src/main/webapp/static/3d/U-Boat_Type_XXIII/images/Wood__FloornoCulling.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 56b974b

Please sign in to comment.