Skip to content

Commit

Permalink
merge conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
y-zaky committed Sep 11, 2017
2 parents 954469f + 8b24616 commit 649a32f
Show file tree
Hide file tree
Showing 13 changed files with 285 additions and 104,384 deletions.
9,264 changes: 0 additions & 9,264 deletions package-lock.json

This file was deleted.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"three": "^0.87.1",
"three-mtl-loader": "^1.0.1",
"three-obj-loader": "^1.1.2",
"three-pointerlock": "0.0.2"
"three-pointerlock": "0.0.2",
"cannon": "github:schteppe/cannon.js"
},
"devDependencies": {
"babel-preset-es2015": "^6.24.1",
Expand Down
Binary file added public/images/crate/healthpack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 30 additions & 22 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,33 +1,41 @@
<!DOCTYPE html>
<html>
<head>
<head>
<title>GD</title>

<head>
<title>GD</title>

<meta charset="utf-8">
<script src='https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.3/socket.io.js'></script>
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
<link rel="stylesheet" href="main.css"/>
<script src='https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.3/socket.io.js'></script>
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
<link rel="stylesheet" href="main.css" />
</head>
<style>
body {
margin: 0;
}

canvas {
width: 100%;
height: 100%
}

</style>
</head>
<style>
body { margin: 0; }
canvas { width: 100%; height: 100% }
</style>
</head>
<body>
<div id="blocker">

<div id="instructions">
<span style="font-size:40px">Click to play</span>
<br />
(W, A, S, D = Move, SPACE = Jump, MOUSE = Look around)
</div>
<body>
<div id="blocker">

<div id="instructions">
<span style="font-size:40px">Click to play</span>
<br /> (W, A, S, D = Move, SPACE = Jump, MOUSE = Look around)
</div>

</div>

</div>
<script type="text/javascript" src="js/bundle.js"></script>

<script type="text/javascript" src="js/bundle.js"></script>
<!-- <script src="./node_modules/three/examples/js/loaders/OBJLoader2.js"</script> -->

<!-- <script src="./node_modules/three/examples/js/loaders/OBJLoader2.js"</script> -->
</body>

</body>
</html>
Loading

0 comments on commit 649a32f

Please sign in to comment.