[Add] Adding some new tiles. Need to get camera working again...
Rtch90
BIN
Data/Media/Images/Tiles/GreyBrickWallCenter.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
Data/Media/Images/Tiles/GreyBrickWallDiagonaLeftBottom.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
BIN
Data/Media/Images/Tiles/GreyBrickWallDiagonalLeftCenter.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
BIN
Data/Media/Images/Tiles/GreyBrickWallDiagonalLeftTop.png
Normal file
|
After Width: | Height: | Size: 1003 B |
BIN
Data/Media/Images/Tiles/GreyBrickWallDiagonalRightBottom.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
Data/Media/Images/Tiles/GreyBrickWallDiagonalRightCenter.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
Data/Media/Images/Tiles/GreyBrickWallDiagonalRightTop.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
Data/Media/Images/Tiles/GreyBrickWallLeft.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
Data/Media/Images/Tiles/GreyBrickWallRight.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
Data/Media/Images/Tiles/MessyBrickWall.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
Data/Media/Images/Tiles/SlateBrickWall.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.4 KiB |
4577
Data/Media/Maps/map
@ -1,6 +1,6 @@
|
|||||||
#############################################################################
|
#############################################################################
|
||||||
# Makefile for building: Unuk-QT
|
# Makefile for building: Unuk-QT
|
||||||
# Generated by qmake (2.01a) (Qt 4.7.3) on: Mon Dec 19 22:05:17 2011
|
# Generated by qmake (2.01a) (Qt 4.7.3) on: Wed Dec 21 23:06:49 2011
|
||||||
# Project: Unuk-QT.pro
|
# Project: Unuk-QT.pro
|
||||||
# Template: app
|
# Template: app
|
||||||
# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
|
# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
|
||||||
|
|||||||
@ -6,7 +6,8 @@ LIBS += -lGL \
|
|||||||
-ltinyxml \
|
-ltinyxml \
|
||||||
-lGLU
|
-lGLU
|
||||||
RESOURCES +=
|
RESOURCES +=
|
||||||
OTHER_FILES += ../src/libUnuk/Debug.o
|
OTHER_FILES += ../src/libUnuk/Debug.o \
|
||||||
|
../Data/Media/Maps/map
|
||||||
HEADERS += ../src/libUnuk/Debug.h \
|
HEADERS += ../src/libUnuk/Debug.h \
|
||||||
../src/Libs/wglext.h \
|
../src/Libs/wglext.h \
|
||||||
../src/Libs/glxext.h \
|
../src/Libs/glxext.h \
|
||||||
|
|||||||
BIN
maptest.png
Normal file
|
After Width: | Height: | Size: 889 KiB |
@ -91,8 +91,8 @@ mainMenuNavVal_t MainMenu::Run(void) {
|
|||||||
if(btnNewGameActive) {
|
if(btnNewGameActive) {
|
||||||
if(btnNewGameYes.CheckMouseOver())
|
if(btnNewGameYes.CheckMouseOver())
|
||||||
return mainMenuNewGame;
|
return mainMenuNewGame;
|
||||||
// else if(btnNewGameNo.CheckMouseOver())
|
//else if(btnNewGameNo.CheckMouseOver())
|
||||||
// return btnNewGameActive = false;
|
//return btnNewGameActive = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,7 +2,7 @@ CC = g++
|
|||||||
CFLAGS = -ansi -Wall -g
|
CFLAGS = -ansi -Wall -g
|
||||||
LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml
|
LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml
|
||||||
objects = ApplySurface.o Button.o ButtonToggle.o Character.o Collision.o \
|
objects = ApplySurface.o Button.o ButtonToggle.o Character.o Collision.o \
|
||||||
Debug.o DialogueBox.o Font.o FPS.o ImageLoader.o IngameMenu.o Input.o MainMenu.o \
|
Debug.o Font.o FPS.o ImageLoader.o IngameMenu.o Input.o MainMenu.o \
|
||||||
Map.o MapElement.o MapEntities.o NPC.o ParticleEmitter.o \
|
Map.o MapElement.o MapEntities.o NPC.o ParticleEmitter.o \
|
||||||
Rect.o Text.o Texture.o TextureManager.o Timer.o \
|
Rect.o Text.o Texture.o TextureManager.o Timer.o \
|
||||||
|
|
||||||
|
|||||||