Skip to content

Commit

Permalink
IMPORTANT: Our code now cant run on emulators. Run on your phone!
Browse files Browse the repository at this point in the history
Fixed all copyright stuff like at the top of files.
  • Loading branch information
kylepaulsen committed Jul 8, 2011
1 parent 238b417 commit f4ed0cb
Show file tree
Hide file tree
Showing 17 changed files with 45 additions and 351 deletions.
3 changes: 2 additions & 1 deletion AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
<application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
<activity android:name=".MainActivity"
android:label="@string/app_name"
android:screenOrientation="landscape">
android:screenOrientation="landscape"
android:launchMode="singleInstance">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
9 changes: 9 additions & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
Open-Android-Game Copyright © 2011 Open-Android-Game Group
The Open-Android-Game Group consists of:
Kyle Paulsen
Ryan Souza
Xiaolong Cheng
Max Strater

Licence terms:

GNU GENERAL PUBLIC LICENSE
Version 2, June 1991

Expand Down
9 changes: 8 additions & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
This is my Open Android Game.
Open-Android-Game Copyright © 2011 Open-Android-Game Group
The Open-Android-Game Group consists of:
Kyle Paulsen
Ryan Souza
Xiaolong Cheng
Max Strater

This is our Open Android Game.
It it built on the Android 2.2 Platform.
Title and other details pending.
9 changes: 8 additions & 1 deletion src/com/kylepaulsen/openAndroidGame/BaseTiles.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
/* BaseTiles.java - Class for loading and displaying just the tiles that show up.
*
* Copyright © 2011 Open-Android-Game Group
* Please see the file COPYING in this
* distribution for license terms.
*/

package com.kylepaulsen.openAndroidGame;

import java.util.Vector;


import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Matrix;
Expand Down Expand Up @@ -30,6 +36,7 @@ public class BaseTiles {
//local tile extent dimension consts:
//32
private int TILE_WIDTH = 55, TILE_HEIGHT = 55;
//private int TILE_WIDTH = 32, TILE_HEIGHT = 32;

//private int BUFFER_PADDING = 1, BUFFER_SHIFT = 4;
private int BUFFER_PADDING = 5, BUFFER_SHIFT = 10;
Expand Down
14 changes: 1 addition & 13 deletions src/com/kylepaulsen/openAndroidGame/Biome.java
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
/* Biome.java - Class for describing biomes.
*
* Copyright © 2011 Kyle Paulsen
* Copyright © 2011 Open-Android-Game Group
* Please see the file COPYING in this
* distribution for license terms.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*/

package com.kylepaulsen.openAndroidGame;
Expand Down
95 changes: 0 additions & 95 deletions src/com/kylepaulsen/openAndroidGame/BouncingViewTest.java

This file was deleted.

143 changes: 0 additions & 143 deletions src/com/kylepaulsen/openAndroidGame/Camera.java

This file was deleted.

14 changes: 1 addition & 13 deletions src/com/kylepaulsen/openAndroidGame/Constants.java
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
/* Constants.java - Class for random game constants.
*
* Copyright © 2011 Kyle Paulsen
* Copyright © 2011 Open-Android-Game Group
* Please see the file COPYING in this
* distribution for license terms.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*/

package com.kylepaulsen.openAndroidGame;
Expand Down
17 changes: 2 additions & 15 deletions src/com/kylepaulsen/openAndroidGame/GameProgram.java
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
/* GameProgram.java - Class for game logic and main loop.
*
* Copyright © 2011 Kyle Paulsen
* Copyright © 2011 Open-Android-Game Group
* Please see the file COPYING in this
* distribution for license terms.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*/

package com.kylepaulsen.openAndroidGame;
Expand Down Expand Up @@ -67,8 +55,6 @@ public void run() {
long startTime;
long sleepFor;

int i = 0, l = 0;

while(running){

//Next frames' Game Logic and stuff goes here.
Expand Down Expand Up @@ -109,5 +95,6 @@ public void setRunning(boolean s){

public void draw(Canvas canvas){
base_tiles.render(canvas);
base_tiles.moveLocation(5, 7);
}
}
Loading

0 comments on commit f4ed0cb

Please sign in to comment.