diff --git a/Unuk-QT/Makefile b/Unuk-QT/Makefile
index 212f55a..f6adef2 100644
--- a/Unuk-QT/Makefile
+++ b/Unuk-QT/Makefile
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: Unuk-QT
-# Generated by qmake (2.01a) (Qt 4.7.3) on: Sun Nov 20 11:37:54 2011
+# Generated by qmake (2.01a) (Qt 4.7.4) on: Sun Nov 20 17:49:45 2011
# Project: Unuk-QT.pro
# Template: app
# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
@@ -10,13 +10,13 @@
CC = gcc
CXX = g++
-DEFINES = -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+DEFINES = -DQT_WEBKIT -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I.
LINK = g++
LFLAGS =
-LIBS = $(SUBLIBS) -L/usr/lib -lGL -lSDL -lSDL_ttf -lSDL_image -lGLU -lQtGui -lQtCore -lpthread
+LIBS = $(SUBLIBS) -L/usr/lib/i386-linux-gnu -lGL -lSDL -lSDL_ttf -lSDL_image -lGLU -lQtGui -lQtCore -lpthread
AR = ar cqs
RANLIB =
QMAKE = /usr/bin/qmake-qt4
@@ -61,7 +61,9 @@ SOURCES = ../src/libUnuk/Debug.cpp \
../src/libUnuk/ParticleEmitter.cpp \
../src/libUnuk/MainMenu.cpp \
../src/libUnuk/IngameMenu.cpp \
- ../src/libUnuk/Collision.cpp
+ ../src/libUnuk/Collision.cpp \
+ ../src/libUnuk/Character.cpp \
+ ../src/libUnuk/NPC.cpp
OBJECTS = Debug.o \
main.o \
Input.o \
@@ -80,11 +82,14 @@ OBJECTS = Debug.o \
ParticleEmitter.o \
MainMenu.o \
IngameMenu.o \
- Collision.o
+ Collision.o \
+ Character.o \
+ NPC.o
DIST = /usr/share/qt4/mkspecs/common/g++.conf \
/usr/share/qt4/mkspecs/common/unix.conf \
/usr/share/qt4/mkspecs/common/linux.conf \
/usr/share/qt4/mkspecs/qconfig.pri \
+ /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
/usr/share/qt4/mkspecs/features/qt_functions.prf \
/usr/share/qt4/mkspecs/features/qt_config.prf \
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
@@ -136,6 +141,7 @@ Makefile: Unuk-QT.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt
/usr/share/qt4/mkspecs/common/unix.conf \
/usr/share/qt4/mkspecs/common/linux.conf \
/usr/share/qt4/mkspecs/qconfig.pri \
+ /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
/usr/share/qt4/mkspecs/features/qt_functions.prf \
/usr/share/qt4/mkspecs/features/qt_config.prf \
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
@@ -151,13 +157,14 @@ Makefile: Unuk-QT.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt
/usr/share/qt4/mkspecs/features/yacc.prf \
/usr/share/qt4/mkspecs/features/lex.prf \
/usr/share/qt4/mkspecs/features/include_source_dir.prf \
- /usr/lib/libQtGui.prl \
- /usr/lib/libQtCore.prl
+ /usr/lib/i386-linux-gnu/libQtGui.prl \
+ /usr/lib/i386-linux-gnu/libQtCore.prl
$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
/usr/share/qt4/mkspecs/common/g++.conf:
/usr/share/qt4/mkspecs/common/unix.conf:
/usr/share/qt4/mkspecs/common/linux.conf:
/usr/share/qt4/mkspecs/qconfig.pri:
+/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri:
/usr/share/qt4/mkspecs/features/qt_functions.prf:
/usr/share/qt4/mkspecs/features/qt_config.prf:
/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
@@ -173,14 +180,14 @@ Makefile: Unuk-QT.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt
/usr/share/qt4/mkspecs/features/yacc.prf:
/usr/share/qt4/mkspecs/features/lex.prf:
/usr/share/qt4/mkspecs/features/include_source_dir.prf:
-/usr/lib/libQtGui.prl:
-/usr/lib/libQtCore.prl:
+/usr/lib/i386-linux-gnu/libQtGui.prl:
+/usr/lib/i386-linux-gnu/libQtCore.prl:
qmake: FORCE
@$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
dist:
@$(CHK_DIR_EXISTS) .tmp/Unuk-QT1.0.0 || $(MKDIR) .tmp/Unuk-QT1.0.0
- $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Debug.h ../src/Libs/wglext.h ../src/Libs/glxext.h ../src/libUnuk/Input.h ../src/libUnuk/Rect.h ../src/libUnuk/Timer.h ../src/libUnuk/Font.h ../Constants.h ../src/Unuk/Constants.h ../src/libUnuk/ApplySurface.h ../src/Unuk/Globals.h ../src/libUnuk/ImageLoader.h ../src/libUnuk/TextureManager.h ../src/libUnuk/Texture.h ../src/libUnuk/Text.h ../src/libUnuk/MapTile.h ../src/libUnuk/Map.h ../src/libUnuk/Button.h ../src/libUnuk/ButtonToggle.h ../src/libUnuk/Menu.h ../src/libUnuk/MainMenu.h ../src/libUnuk/ParticleEmitter.h ../src/libUnuk/IngameMenu.h ../src/libUnuk/Collision.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Debug.cpp ../src/Unuk/main.cpp ../src/libUnuk/Input.cpp ../src/libUnuk/Timer.cpp ../src/libUnuk/Font.cpp ../src/libUnuk/ApplySurface.cpp ../src/Unuk/Globals.cpp ../src/libUnuk/Rect.cpp ../src/libUnuk/ImageLoader.cpp ../src/libUnuk/TextureManager.cpp ../src/libUnuk/Texture.cpp ../src/libUnuk/Text.cpp ../src/libUnuk/Map.cpp ../src/libUnuk/Button.cpp ../src/libUnuk/ButtonToggle.cpp ../src/libUnuk/ParticleEmitter.cpp ../src/libUnuk/MainMenu.cpp ../src/libUnuk/IngameMenu.cpp ../src/libUnuk/Collision.cpp .tmp/Unuk-QT1.0.0/ && (cd `dirname .tmp/Unuk-QT1.0.0` && $(TAR) Unuk-QT1.0.0.tar Unuk-QT1.0.0 && $(COMPRESS) Unuk-QT1.0.0.tar) && $(MOVE) `dirname .tmp/Unuk-QT1.0.0`/Unuk-QT1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Unuk-QT1.0.0
+ $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Debug.h ../src/Libs/wglext.h ../src/Libs/glxext.h ../src/libUnuk/Input.h ../src/libUnuk/Rect.h ../src/libUnuk/Timer.h ../src/libUnuk/Font.h ../Constants.h ../src/Unuk/Constants.h ../src/libUnuk/ApplySurface.h ../src/Unuk/Globals.h ../src/libUnuk/ImageLoader.h ../src/libUnuk/TextureManager.h ../src/libUnuk/Texture.h ../src/libUnuk/Text.h ../src/libUnuk/MapTile.h ../src/libUnuk/Map.h ../src/libUnuk/Button.h ../src/libUnuk/ButtonToggle.h ../src/libUnuk/Menu.h ../src/libUnuk/MainMenu.h ../src/libUnuk/ParticleEmitter.h ../src/libUnuk/IngameMenu.h ../src/libUnuk/Collision.h ../src/libUnuk/Character.h ../src/libUnuk/NPC.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Debug.cpp ../src/Unuk/main.cpp ../src/libUnuk/Input.cpp ../src/libUnuk/Timer.cpp ../src/libUnuk/Font.cpp ../src/libUnuk/ApplySurface.cpp ../src/Unuk/Globals.cpp ../src/libUnuk/Rect.cpp ../src/libUnuk/ImageLoader.cpp ../src/libUnuk/TextureManager.cpp ../src/libUnuk/Texture.cpp ../src/libUnuk/Text.cpp ../src/libUnuk/Map.cpp ../src/libUnuk/Button.cpp ../src/libUnuk/ButtonToggle.cpp ../src/libUnuk/ParticleEmitter.cpp ../src/libUnuk/MainMenu.cpp ../src/libUnuk/IngameMenu.cpp ../src/libUnuk/Collision.cpp ../src/libUnuk/Character.cpp ../src/libUnuk/NPC.cpp .tmp/Unuk-QT1.0.0/ && (cd `dirname .tmp/Unuk-QT1.0.0` && $(TAR) Unuk-QT1.0.0.tar Unuk-QT1.0.0 && $(COMPRESS) Unuk-QT1.0.0.tar) && $(MOVE) `dirname .tmp/Unuk-QT1.0.0`/Unuk-QT1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Unuk-QT1.0.0
clean:compiler_clean
@@ -354,6 +361,33 @@ IngameMenu.o: ../src/libUnuk/IngameMenu.cpp ../src/libUnuk/IngameMenu.h \
Collision.o: ../src/libUnuk/Collision.cpp ../src/libUnuk/Collision.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Collision.o ../src/libUnuk/Collision.cpp
+Character.o: ../src/libUnuk/Character.cpp ../src/libUnuk/Character.h \
+ ../src/Unuk/Globals.h \
+ ../src/Unuk/Constants.h \
+ ../src/libUnuk/ApplySurface.h \
+ ../src/libUnuk/Debug.h \
+ ../src/libUnuk/ImageLoader.h \
+ ../src/libUnuk/Collision.h \
+ ../src/libUnuk/Map.h \
+ ../src/libUnuk/TextureManager.h \
+ ../src/libUnuk/MapTile.h \
+ ../src/libUnuk/Timer.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Character.o ../src/libUnuk/Character.cpp
+
+NPC.o: ../src/libUnuk/NPC.cpp ../src/libUnuk/NPC.h \
+ ../src/libUnuk/Character.h \
+ ../src/Unuk/Globals.h \
+ ../src/Unuk/Constants.h \
+ ../src/libUnuk/ApplySurface.h \
+ ../src/libUnuk/Debug.h \
+ ../src/libUnuk/ImageLoader.h \
+ ../src/libUnuk/Collision.h \
+ ../src/libUnuk/Map.h \
+ ../src/libUnuk/TextureManager.h \
+ ../src/libUnuk/MapTile.h \
+ ../src/libUnuk/Timer.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o NPC.o ../src/libUnuk/NPC.cpp
+
####### Install
install: FORCE
diff --git a/Unuk-QT/Unuk-QT.pro b/Unuk-QT/Unuk-QT.pro
index ec30de0..200f88d 100644
--- a/Unuk-QT/Unuk-QT.pro
+++ b/Unuk-QT/Unuk-QT.pro
@@ -28,7 +28,9 @@ HEADERS += ../src/libUnuk/Debug.h \
../src/libUnuk/MainMenu.h \
../src/libUnuk/ParticleEmitter.h \
../src/libUnuk/IngameMenu.h \
- ../src/libUnuk/Collision.h
+ ../src/libUnuk/Collision.h \
+ ../src/libUnuk/Character.h \
+ ../src/libUnuk/NPC.h
SOURCES += ../src/libUnuk/Debug.cpp \
../src/Unuk/main.cpp \
../src/libUnuk/Input.cpp \
@@ -47,4 +49,6 @@ SOURCES += ../src/libUnuk/Debug.cpp \
../src/libUnuk/ParticleEmitter.cpp \
../src/libUnuk/MainMenu.cpp \
../src/libUnuk/IngameMenu.cpp \
- ../src/libUnuk/Collision.cpp
+ ../src/libUnuk/Collision.cpp \
+ ../src/libUnuk/Character.cpp \
+ ../src/libUnuk/NPC.cpp
diff --git a/Unuk-QT/Unuk-QT.pro.user b/Unuk-QT/Unuk-QT.pro.user
index c0a40a4..4ed7298 100644
--- a/Unuk-QT/Unuk-QT.pro.user
+++ b/Unuk-QT/Unuk-QT.pro.user
@@ -1,318 +1,207 @@
- RunConfiguration0-BaseEnvironmentBase
- 2
-
-
- RunConfiguration0-CommandLineArguments
-
-
-
- RunConfiguration0-ProFile
- Unuk-QT.pro
-
-
- RunConfiguration0-RunConfiguration.name
- Unuk-QT
-
-
- RunConfiguration0-UseDyldImageSuffix
- false
-
-
- RunConfiguration0-UseTerminal
- false
-
-
- RunConfiguration0-UserEnvironmentChanges
-
-
-
- RunConfiguration0-UserSetName
- false
-
-
- RunConfiguration0-UserSetWorkingDirectory
- false
-
-
- RunConfiguration0-UserWorkingDirectory
-
-
-
- RunConfiguration0-type
- Qt4ProjectManager.Qt4RunConfiguration
-
-
- activeRunConfiguration
+ ProjectExplorer.Project.ActiveTarget
0
- activebuildconfiguration
- Debug
-
-
- buildConfiguration-Debug
+ ProjectExplorer.Project.EditorSettings
- Debug
- 0
- 0
-
- 2
+ true
+ false
+ ISO-8859-1
+ false
+ false
+ 2
+ true
+ 1
+ true
+ false
+ true
+ 0
+ 2
+ true
+ 1
+ true
+ true
+ true
+ false
- buildConfiguration-Release
+ ProjectExplorer.Project.Target.0
- Release
- 0
-
- 0
+
+
+ Qt4ProjectManager.Target.DesktopTarget
+ 0
+ 0
+ 0
+
+ ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit.
+
+
+ qmake
+
+ QtProjectManager.QMakeBuildStep
+ false
+
+ false
+
+
+ Make
+
+ Qt4ProjectManager.MakeStep
+ false
+
+
+
+ 2
+ Build
+ Build
+ ProjectExplorer.BuildSteps.Build
+
+
+
+ Make
+
+ Qt4ProjectManager.MakeStep
+ true
+ clean
+
+
+ 1
+ Clean
+ Clean
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Debug
+ Debug
+ Qt4ProjectManager.Qt4BuildConfiguration
+ 2
+ /home/allanis/Unuk/Unuk-QT-build-desktop
+ 2
+ ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit.
+ false
+
+
+ ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit.
+
+
+ qmake
+
+ QtProjectManager.QMakeBuildStep
+ false
+
+ false
+
+
+ Make
+
+ Qt4ProjectManager.MakeStep
+ false
+
+
+
+ 2
+ Build
+ Build
+ ProjectExplorer.BuildSteps.Build
+
+
+
+ Make
+
+ Qt4ProjectManager.MakeStep
+ true
+
+
+
+ 1
+ Clean
+ Clean
+ ProjectExplorer.BuildSteps.Clean
+
+ 2
+ false
+
+ Release
+ Release
+ Qt4ProjectManager.Qt4BuildConfiguration
+ 0
+ /home/allanis/Unuk/Unuk-QT-build-desktop
+ 2
+ ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit.
+ false
+
+ 2
+
+
+ 0
+ Deploy
+ Deploy
+ ProjectExplorer.BuildSteps.Deploy
+
+ 1
+ No deployment
+ No deployment
+ ProjectExplorer.DefaultDeployConfiguration
+
+ 1
+
+
+ true
+ 25
+
+ true
+ valgrind
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+ 11
+ 12
+ 13
+ 14
+
+ Qt4 RunConfiguration
+ Unuk-QT
+ Qt4ProjectManager.Qt4RunConfiguration
+ 2
+
+ Unuk-QT.pro
+ false
+ false
+
+
+ 3768
+ true
+ false
+
+ 1
- buildconfiguration-Debug-buildstep0
-
- Debug
-
- DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-JFV86sNXp3,guid=10f3cd54b9c84ffcc277c29900000065
- DISPLAY=:0
- HOME=/home/allanis
- HUSHLOGIN=FALSE
- LD_LIBRARY_PATH=/usr/lib/qtcreator
- LOGNAME=allanis
- LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:
- MAIL=/var/mail/allanis
- PATH=/usr/bin:/home/allanis/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/sbin:/sbin
- PWD=/home/allanis
- QTDIR=/usr/share/qt4
- SHELL=/bin/bash
- SHLVL=1
- SSH_AGENT_PID=3195
- SSH_AUTH_SOCK=/tmp/ssh-xWDTLRHH3170/agent.3170
- TERM=linux
- USER=allanis
- WINDOWPATH=7
- XAUTHORITY=/home/allanis/.Xauthority
- XDG_SESSION_COOKIE=6de6dd7b78e791242262c6460000012e-1321716676.954190-403254936
- _=/usr/bin/startx
-
-
- /home/allanis/Unuk/Unuk-QT/Unuk-QT.pro
- -spec
- linux-g++
- -r
- CONFIG+=debug
-
- /usr/bin/qmake-qt4
- false
- /home/allanis/Unuk/Unuk-QT
-
+ ProjectExplorer.Project.TargetCount
+ 1
- buildconfiguration-Debug-buildstep1
-
- Debug
-
- DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-JFV86sNXp3,guid=10f3cd54b9c84ffcc277c29900000065
- DISPLAY=:0
- HOME=/home/allanis
- HUSHLOGIN=FALSE
- LD_LIBRARY_PATH=/usr/lib/qtcreator
- LOGNAME=allanis
- LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:
- MAIL=/var/mail/allanis
- PATH=/usr/bin:/home/allanis/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/sbin:/sbin
- PWD=/home/allanis
- QTDIR=/usr/share/qt4
- SHELL=/bin/bash
- SHLVL=1
- SSH_AGENT_PID=3195
- SSH_AUTH_SOCK=/tmp/ssh-xWDTLRHH3170/agent.3170
- TERM=linux
- USER=allanis
- WINDOWPATH=7
- XAUTHORITY=/home/allanis/.Xauthority
- XDG_SESSION_COOKIE=6de6dd7b78e791242262c6460000012e-1321716676.954190-403254936
- _=/usr/bin/startx
-
- false
-
- -w
-
- /usr/bin/make
- true
- /home/allanis/Unuk/Unuk-QT
-
+ ProjectExplorer.Project.Updater.EnvironmentId
+ {359fc55d-3b68-417e-92d9-996c90e029a7}
- buildconfiguration-Debug-cleanstep0
-
- Debug
-
- DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-JFV86sNXp3,guid=10f3cd54b9c84ffcc277c29900000065
- DISPLAY=:0
- HOME=/home/allanis
- HUSHLOGIN=FALSE
- LD_LIBRARY_PATH=/usr/lib/qtcreator
- LOGNAME=allanis
- LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:
- MAIL=/var/mail/allanis
- PATH=/usr/bin:/home/allanis/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/sbin:/sbin
- PWD=/home/allanis
- QTDIR=/usr/share/qt4
- SHELL=/bin/bash
- SHLVL=1
- SSH_AGENT_PID=3195
- SSH_AUTH_SOCK=/tmp/ssh-xWDTLRHH3170/agent.3170
- TERM=linux
- USER=allanis
- WINDOWPATH=7
- XAUTHORITY=/home/allanis/.Xauthority
- XDG_SESSION_COOKIE=6de6dd7b78e791242262c6460000012e-1321716676.954190-403254936
- _=/usr/bin/startx
-
- true
-
- clean
- -w
-
- /usr/bin/make
- true
- /home/allanis/Unuk/Unuk-QT
- true
-
- clean
-
-
-
-
- buildconfiguration-Release-buildstep0
-
- Release
-
- DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-bASjAF89Ou,guid=3c44d6b9c9f472128b547b8300000047
- DISPLAY=:0
- HOME=/home/allanis
- HUSHLOGIN=FALSE
- LD_LIBRARY_PATH=/usr/lib/qtcreator
- LOGNAME=allanis
- LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:
- MAIL=/var/mail/allanis
- PATH=/usr/bin:/home/allanis/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/sbin:/sbin
- PWD=/home/allanis
- QTDIR=/usr/share/qt4
- SHELL=/bin/bash
- SHLVL=1
- SSH_AGENT_PID=3224
- SSH_AUTH_SOCK=/tmp/ssh-zYjDAHRv3201/agent.3201
- TERM=linux
- USER=allanis
- WINDOWPATH=7
- XAUTHORITY=/home/allanis/.Xauthority
- XDG_SESSION_COOKIE=6de6dd7b78e791242262c6460000012e-1317373306.554178-1370043490
- _=/usr/bin/startx
-
-
- /drv/storage/Projects/Portfolio/saracraft/trunk/Unuk/Unuk-QT/Unuk-QT.pro
- -spec
- linux-g++
- -r
-
- /usr/bin/qmake-qt4
- false
- /drv/storage/Projects/Portfolio/saracraft/trunk/Unuk/Unuk-QT
-
-
-
- buildconfiguration-Release-buildstep1
-
- Release
-
- DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-bASjAF89Ou,guid=3c44d6b9c9f472128b547b8300000047
- DISPLAY=:0
- HOME=/home/allanis
- HUSHLOGIN=FALSE
- LD_LIBRARY_PATH=/usr/lib/qtcreator
- LOGNAME=allanis
- LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:
- MAIL=/var/mail/allanis
- PATH=/usr/bin:/home/allanis/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/sbin:/sbin
- PWD=/home/allanis
- QTDIR=/usr/share/qt4
- SHELL=/bin/bash
- SHLVL=1
- SSH_AGENT_PID=3224
- SSH_AUTH_SOCK=/tmp/ssh-zYjDAHRv3201/agent.3201
- TERM=linux
- USER=allanis
- WINDOWPATH=7
- XAUTHORITY=/home/allanis/.Xauthority
- XDG_SESSION_COOKIE=6de6dd7b78e791242262c6460000012e-1317373306.554178-1370043490
- _=/usr/bin/startx
-
- false
-
- -w
-
- /usr/bin/make
- true
- /drv/storage/Projects/Portfolio/saracraft/trunk/Unuk/Unuk-QT
-
-
-
- buildconfiguration-Release-cleanstep0
-
- Release
-
-
-
- buildconfigurations
-
- Debug
- Release
-
-
-
- buildstep0
-
-
-
-
-
-
- buildstep1
-
-
-
-
-
- buildsteps
-
- trolltech.qt4projectmanager.qmake
- trolltech.qt4projectmanager.make
-
-
-
- cleanstep0
-
-
- true
-
-
-
- cleansteps
-
- trolltech.qt4projectmanager.make
-
-
-
- defaultFileEncoding
- ISO-8859-1
-
-
- project
-
+ ProjectExplorer.Project.Updater.FileVersion
+ 9
diff --git a/Unuk-QT/Unuk-QT.pro.user.1.3 b/Unuk-QT/Unuk-QT.pro.user.1.3
new file mode 100644
index 0000000..c0a40a4
--- /dev/null
+++ b/Unuk-QT/Unuk-QT.pro.user.1.3
@@ -0,0 +1,318 @@
+
+
+
+ RunConfiguration0-BaseEnvironmentBase
+ 2
+
+
+ RunConfiguration0-CommandLineArguments
+
+
+
+ RunConfiguration0-ProFile
+ Unuk-QT.pro
+
+
+ RunConfiguration0-RunConfiguration.name
+ Unuk-QT
+
+
+ RunConfiguration0-UseDyldImageSuffix
+ false
+
+
+ RunConfiguration0-UseTerminal
+ false
+
+
+ RunConfiguration0-UserEnvironmentChanges
+
+
+
+ RunConfiguration0-UserSetName
+ false
+
+
+ RunConfiguration0-UserSetWorkingDirectory
+ false
+
+
+ RunConfiguration0-UserWorkingDirectory
+
+
+
+ RunConfiguration0-type
+ Qt4ProjectManager.Qt4RunConfiguration
+
+
+ activeRunConfiguration
+ 0
+
+
+ activebuildconfiguration
+ Debug
+
+
+ buildConfiguration-Debug
+
+ Debug
+ 0
+ 0
+
+ 2
+
+
+
+ buildConfiguration-Release
+
+ Release
+ 0
+
+ 0
+
+
+
+ buildconfiguration-Debug-buildstep0
+
+ Debug
+
+ DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-JFV86sNXp3,guid=10f3cd54b9c84ffcc277c29900000065
+ DISPLAY=:0
+ HOME=/home/allanis
+ HUSHLOGIN=FALSE
+ LD_LIBRARY_PATH=/usr/lib/qtcreator
+ LOGNAME=allanis
+ LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:
+ MAIL=/var/mail/allanis
+ PATH=/usr/bin:/home/allanis/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/sbin:/sbin
+ PWD=/home/allanis
+ QTDIR=/usr/share/qt4
+ SHELL=/bin/bash
+ SHLVL=1
+ SSH_AGENT_PID=3195
+ SSH_AUTH_SOCK=/tmp/ssh-xWDTLRHH3170/agent.3170
+ TERM=linux
+ USER=allanis
+ WINDOWPATH=7
+ XAUTHORITY=/home/allanis/.Xauthority
+ XDG_SESSION_COOKIE=6de6dd7b78e791242262c6460000012e-1321716676.954190-403254936
+ _=/usr/bin/startx
+
+
+ /home/allanis/Unuk/Unuk-QT/Unuk-QT.pro
+ -spec
+ linux-g++
+ -r
+ CONFIG+=debug
+
+ /usr/bin/qmake-qt4
+ false
+ /home/allanis/Unuk/Unuk-QT
+
+
+
+ buildconfiguration-Debug-buildstep1
+
+ Debug
+
+ DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-JFV86sNXp3,guid=10f3cd54b9c84ffcc277c29900000065
+ DISPLAY=:0
+ HOME=/home/allanis
+ HUSHLOGIN=FALSE
+ LD_LIBRARY_PATH=/usr/lib/qtcreator
+ LOGNAME=allanis
+ LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:
+ MAIL=/var/mail/allanis
+ PATH=/usr/bin:/home/allanis/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/sbin:/sbin
+ PWD=/home/allanis
+ QTDIR=/usr/share/qt4
+ SHELL=/bin/bash
+ SHLVL=1
+ SSH_AGENT_PID=3195
+ SSH_AUTH_SOCK=/tmp/ssh-xWDTLRHH3170/agent.3170
+ TERM=linux
+ USER=allanis
+ WINDOWPATH=7
+ XAUTHORITY=/home/allanis/.Xauthority
+ XDG_SESSION_COOKIE=6de6dd7b78e791242262c6460000012e-1321716676.954190-403254936
+ _=/usr/bin/startx
+
+ false
+
+ -w
+
+ /usr/bin/make
+ true
+ /home/allanis/Unuk/Unuk-QT
+
+
+
+ buildconfiguration-Debug-cleanstep0
+
+ Debug
+
+ DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-JFV86sNXp3,guid=10f3cd54b9c84ffcc277c29900000065
+ DISPLAY=:0
+ HOME=/home/allanis
+ HUSHLOGIN=FALSE
+ LD_LIBRARY_PATH=/usr/lib/qtcreator
+ LOGNAME=allanis
+ LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:
+ MAIL=/var/mail/allanis
+ PATH=/usr/bin:/home/allanis/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/sbin:/sbin
+ PWD=/home/allanis
+ QTDIR=/usr/share/qt4
+ SHELL=/bin/bash
+ SHLVL=1
+ SSH_AGENT_PID=3195
+ SSH_AUTH_SOCK=/tmp/ssh-xWDTLRHH3170/agent.3170
+ TERM=linux
+ USER=allanis
+ WINDOWPATH=7
+ XAUTHORITY=/home/allanis/.Xauthority
+ XDG_SESSION_COOKIE=6de6dd7b78e791242262c6460000012e-1321716676.954190-403254936
+ _=/usr/bin/startx
+
+ true
+
+ clean
+ -w
+
+ /usr/bin/make
+ true
+ /home/allanis/Unuk/Unuk-QT
+ true
+
+ clean
+
+
+
+
+ buildconfiguration-Release-buildstep0
+
+ Release
+
+ DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-bASjAF89Ou,guid=3c44d6b9c9f472128b547b8300000047
+ DISPLAY=:0
+ HOME=/home/allanis
+ HUSHLOGIN=FALSE
+ LD_LIBRARY_PATH=/usr/lib/qtcreator
+ LOGNAME=allanis
+ LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:
+ MAIL=/var/mail/allanis
+ PATH=/usr/bin:/home/allanis/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/sbin:/sbin
+ PWD=/home/allanis
+ QTDIR=/usr/share/qt4
+ SHELL=/bin/bash
+ SHLVL=1
+ SSH_AGENT_PID=3224
+ SSH_AUTH_SOCK=/tmp/ssh-zYjDAHRv3201/agent.3201
+ TERM=linux
+ USER=allanis
+ WINDOWPATH=7
+ XAUTHORITY=/home/allanis/.Xauthority
+ XDG_SESSION_COOKIE=6de6dd7b78e791242262c6460000012e-1317373306.554178-1370043490
+ _=/usr/bin/startx
+
+
+ /drv/storage/Projects/Portfolio/saracraft/trunk/Unuk/Unuk-QT/Unuk-QT.pro
+ -spec
+ linux-g++
+ -r
+
+ /usr/bin/qmake-qt4
+ false
+ /drv/storage/Projects/Portfolio/saracraft/trunk/Unuk/Unuk-QT
+
+
+
+ buildconfiguration-Release-buildstep1
+
+ Release
+
+ DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-bASjAF89Ou,guid=3c44d6b9c9f472128b547b8300000047
+ DISPLAY=:0
+ HOME=/home/allanis
+ HUSHLOGIN=FALSE
+ LD_LIBRARY_PATH=/usr/lib/qtcreator
+ LOGNAME=allanis
+ LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:
+ MAIL=/var/mail/allanis
+ PATH=/usr/bin:/home/allanis/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/sbin:/sbin
+ PWD=/home/allanis
+ QTDIR=/usr/share/qt4
+ SHELL=/bin/bash
+ SHLVL=1
+ SSH_AGENT_PID=3224
+ SSH_AUTH_SOCK=/tmp/ssh-zYjDAHRv3201/agent.3201
+ TERM=linux
+ USER=allanis
+ WINDOWPATH=7
+ XAUTHORITY=/home/allanis/.Xauthority
+ XDG_SESSION_COOKIE=6de6dd7b78e791242262c6460000012e-1317373306.554178-1370043490
+ _=/usr/bin/startx
+
+ false
+
+ -w
+
+ /usr/bin/make
+ true
+ /drv/storage/Projects/Portfolio/saracraft/trunk/Unuk/Unuk-QT
+
+
+
+ buildconfiguration-Release-cleanstep0
+
+ Release
+
+
+
+ buildconfigurations
+
+ Debug
+ Release
+
+
+
+ buildstep0
+
+
+
+
+
+
+ buildstep1
+
+
+
+
+
+ buildsteps
+
+ trolltech.qt4projectmanager.qmake
+ trolltech.qt4projectmanager.make
+
+
+
+ cleanstep0
+
+
+ true
+
+
+
+ cleansteps
+
+ trolltech.qt4projectmanager.make
+
+
+
+ defaultFileEncoding
+ ISO-8859-1
+
+
+ project
+
+
+
diff --git a/src/libUnuk/Character.cpp b/src/libUnuk/Character.cpp
new file mode 100644
index 0000000..a7c89c0
--- /dev/null
+++ b/src/libUnuk/Character.cpp
@@ -0,0 +1,159 @@
+#include "Character.h"
+
+// Pixels * 60 / sec
+const float Character::CHARACTER_SPEED = 2.f;
+
+static listcollisionList;
+static list::iterator collisionIterator;
+
+Character::Character(Map* mapArg) {
+ map = mapArg;
+ m_attacking = false;
+ m_directionFacing = FACING_DOWN;
+ m_animationStage = ANIM_NO_FOOT;
+ m_animationTimer.Start();
+ m_leftFoot = false;
+
+ xVel = 0.0f;
+ yVel = 0.0f;
+
+ m_texture = NULL;
+
+ collisionList.push_front(this);
+}
+
+Character::~Character(void) {
+ SDL_FreeSurface(m_texture);
+ for(collisionIterator = collisionList.begin(); collisionIterator != collisionList.end(); collisionIterator++) {
+ if((*collisionIterator) == this) {
+ collisionList.erase(collisionIterator);
+ break;
+ }
+ }
+}
+
+void Character::Render(void) {
+ if(m_attacking && m_attackTimer.GetTicks() < ATTACKING_DISPLAY_LEN) {
+ ApplySurface(x, y, m_texture, screen, &sprites[m_directionFacing][ANIM_ATTACK]);
+ return;
+ }
+ else if(m_attacking)
+ m_attacking = false;
+
+ if(xVel == 0.0f && yVel == 0.0f)
+ ApplySurface(x, y, m_texture, screen, &sprites[m_directionFacing][ANIM_NO_FOOT]);
+ else {
+ if(m_animationTimer.GetTicks() > ANIMATION_SPEED) {
+ if(m_animationStage == ANIM_NO_FOOT) {
+ if(m_leftFoot == true)
+ m_animationStage = ANIM_RIGHT_FOOT;
+ else
+ m_animationStage = ANIM_LEFT_FOOT;
+ }
+ else if(m_animationStage == ANIM_LEFT_FOOT) {
+ m_animationStage = ANIM_NO_FOOT;
+ m_leftFoot = true;
+ }
+ else if(m_animationStage == ANIM_RIGHT_FOOT) {
+ m_animationStage = ANIM_NO_FOOT;
+ m_leftFoot = false;
+ }
+ m_animationTimer.Start();
+ }
+ ApplySurface(x, y, m_texture, screen, &sprites[m_directionFacing][m_animationStage]);
+ }
+}
+
+void Character::LoadSprites(string filename, int wArg, int hArg) {
+ if(m_texture != NULL)
+ SDL_FreeSurface(m_texture);
+
+ m_texture = LoadImageAlpha(filename.c_str());
+
+ w = wArg;
+ h = hArg;
+
+ for(int m_direction = 0; m_direction < 4; m_direction++) {
+ for(int m_action = 0; m_action < 4; m_action++) {
+ sprites[m_direction][m_action].x = w * m_action;
+ sprites[m_direction][m_action].y = h * m_direction;
+ sprites[m_direction][m_action].w = w;
+ sprites[m_direction][m_action].h = h;
+ }
+ }
+}
+
+void Character::Update(void) {
+ Move();
+}
+
+void Character::Move(void) {
+ x += xVel;
+ tileX = ((x + (w / 2)) / TILE_WIDTH);
+ tileY = ((y + (h / 2)) / TILE_HEIGHT);
+
+ if((x < 0) || (x + w) > levelWidth)
+ x -= xVel;
+ if(CheckTileCollisions())
+ x -= xVel;
+ if(CheckEntityCollisions())
+ x -= xVel;
+ if(CheckCharacterCollisions())
+ x -= xVel;
+
+ y += yVel;
+ tileX = ((x + (w / 2)) / TILE_WIDTH);
+ tileY = ((y + (h / 2)) / TILE_HEIGHT);
+
+ if((y < 0) || (y + h) > levelHeight)
+ y -= yVel;
+ if(CheckTileCollisions())
+ y -= yVel;
+ if(CheckEntityCollisions())
+ y -= yVel;
+ if(CheckCharacterCollisions())
+ y -= yVel;
+}
+
+bool Character::CheckTileCollisions(void) {
+ for(int i = -1; i < 2; i++) {
+ for(int j = -1; j < 2; j++) {
+ if(map->GetTileSolidity(tileX + i, tileY + j))
+ if(CheckCollisionXY(x, y, w, h, map->GetTileX(tileX + i, tileY + j),
+ map->GetTileY(tileX + i, tileY + j), TILE_WIDTH, TILE_HEIGHT))
+ return true;
+ }
+ }
+ return false;
+}
+
+bool Character::CheckEntityCollisions(void) {
+ for(int i = -1; i < 2; i++) {
+ for(int j = -1; j < 2; j++) {
+ if(map->GetEntitySolidity(tileX + i, tileY + j))
+ if(CheckCollisionXY(x, y, w, h, map->GetEntityX(tileX + i, tileY + j),
+ map->GetEntityY(tileX + i, tileY + j),
+ map->GetEntityWidth(tileX + i, tileY + j),
+ map->GetEntityHeight(tileX + i, tileY + j)))
+ return true;
+ }
+ }
+ return false;
+}
+
+bool Character::CheckCharacterCollisions(void) {
+ for(collisionIterator = collisionList.begin();
+ collisionIterator != collisionList.end();
+ collisionIterator++) {
+ if((*collisionIterator) != this) {
+ if(CheckCollisionXY(x, y, w, h,
+ (*collisionIterator)->GetX(),
+ (*collisionIterator)->GetY(),
+ (*collisionIterator)->GetWidth(),
+ (*collisionIterator)->GetHeight())) {
+ return true;
+ }
+ }
+ }
+ return false;
+}
diff --git a/src/libUnuk/Character.h b/src/libUnuk/Character.h
new file mode 100644
index 0000000..90aaaf4
--- /dev/null
+++ b/src/libUnuk/Character.h
@@ -0,0 +1,86 @@
+#ifndef _CHARACTER_H_
+#define _CHARACTER_H_
+#include
+#include
+
+#include "../Unuk/Globals.h"
+#include "../Unuk/Constants.h"
+#include "ApplySurface.h"
+#include "ImageLoader.h"
+#include "Collision.h"
+#include "Map.h"
+#include "Timer.h"
+using namespace std;
+
+class Map;
+
+class Character {
+public:
+ Character(Map* mapArg);
+ ~Character(void);
+
+ float GetX(void) { return x; }
+ float GetY(void) { return y; }
+ float GetWidth(void) { return w; }
+ float GetHeight(void) { return h; }
+
+ void SetXY(float xArg, float yArg) { x = xArg, y = yArg; }
+ void SetXVelocity(float arg) { xVel = arg; }
+ void SetYVelocity(float arg) { yVel = arg; }
+
+ void Render(void);
+ void LoadSprites(string filename, int wArg, int hArg);
+
+ void Update(void);
+
+protected:
+ void Move(void);
+
+ bool CheckTileCollisions(void);
+ bool CheckEntityCollisions(void);
+ bool CheckCharacterCollisions(void);
+
+ float x;
+ float y;
+ float w;
+ float h;
+
+ float xVel;
+ float yVel;
+
+ int tileX;
+ int tileY;
+
+ Timer m_attackTimer;
+ bool m_attacking;
+
+ Map* map;
+
+ static const float CHARACTER_SPEED;
+
+ int m_directionFacing;
+ static const int FACING_UP = 0;
+ static const int FACING_RIGHT = 1;
+ static const int FACING_DOWN = 2;
+ static const int FACING_LEFT = 3;
+
+ static const int ANIM_LEFT_FOOT = 0;
+ static const int ANIM_NO_FOOT = 1;
+ static const int ANIM_RIGHT_FOOT = 2;
+ static const int ANIM_ATTACK = 3;
+
+private:
+ static const int ANIMATION_SPEED = 200;
+ static const int ATTACKING_DISPLAY_LEN = 100;
+
+ SDL_Surface* m_texture;
+
+ // [direction][action]
+ SDL_Rect sprites[4][4];
+
+ Timer m_animationTimer;
+ int m_animationStage;
+ bool m_leftFoot;
+};
+
+#endif
diff --git a/src/libUnuk/NPC.cpp b/src/libUnuk/NPC.cpp
new file mode 100644
index 0000000..91ca7f9
--- /dev/null
+++ b/src/libUnuk/NPC.cpp
@@ -0,0 +1,47 @@
+#include "NPC.h"
+
+NPC::NPC(Map* mapArg) : Character(mapArg) {
+ m_moveTimer.Start();
+
+ m_moveChangeFrequency = 14000;
+ m_moveDurationMax = 3000;
+ m_moveDurationMin = 1000;
+}
+
+NPC::~NPC(void) {
+
+}
+
+void NPC::Move(void) {
+ if(m_moving && m_moveTimer.GetTicks() > m_moveDurationMax) {
+ xVel = 0.0f;
+ yVel = 0.0f;
+ m_moving = false;
+ }
+
+ if(m_moving && m_moveTimer.GetTicks() >= m_moveDurationCurrent) {
+ xVel = 0.0f;
+ yVel = 0.0f;
+ m_moving = false;
+ }
+
+ if(m_moveTimer.GetTicks() > m_moveChangeFrequency) {
+ m_moveTimer.Start();
+ m_moveDurationCurrent = m_moveDurationMin + (rand() % (m_moveDurationMax - m_moveDurationMin));
+ if(rand() % 2) {
+ yVel = 0.0f;
+ if(rand() % 2)
+ xVel = CHARACTER_SPEED;
+ else
+ xVel = -CHARACTER_SPEED;
+ } else {
+ xVel = 0.0f;
+ if(rand() % 2)
+ yVel = CHARACTER_SPEED;
+ else
+ yVel = -CHARACTER_SPEED;
+ }
+ m_moving = true;
+ }
+ Character::Move();
+}
diff --git a/src/libUnuk/NPC.h b/src/libUnuk/NPC.h
new file mode 100644
index 0000000..aa44738
--- /dev/null
+++ b/src/libUnuk/NPC.h
@@ -0,0 +1,28 @@
+#ifndef _NPC_H_
+#define _NPC_H_
+
+#include "Character.h"
+
+class NPC : public Character {
+public:
+ NPC(Map* mapArg);
+ ~NPC(void);
+
+ void Update(void);
+
+protected:
+ void Move(void);
+
+private:
+ int m_moveChangeFrequency;
+
+ int m_moveDurationCurrent;
+ int m_moveDurationMin;
+ int m_moveDurationMax;
+
+ bool m_moving;
+
+ Timer m_moveTimer;
+};
+
+#endif
\ No newline at end of file