diff --git a/ADeditor/ADeditor b/ADeditor/ADeditor
deleted file mode 100755
index 937e919..0000000
Binary files a/ADeditor/ADeditor and /dev/null differ
diff --git a/ADeditor/Makefile b/ADeditor/Makefile
deleted file mode 100644
index e5b6bda..0000000
--- a/ADeditor/Makefile
+++ /dev/null
@@ -1,384 +0,0 @@
-#############################################################################
-# Makefile for building: ADeditor
-# Generated by qmake (2.01a) (Qt 4.7.0) on: ?? ???. 26 18:09:05 2010
-# Project: ADeditor.pro
-# Template: app
-# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug QMLINSPECTOR_PATH=/usr/share/qtcreator/qmljsdebugger -o Makefile ADeditor.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC = gcc
-CXX = g++
-DEFINES = -DQT_XMLPATTERNS_LIB -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS = -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS = -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/QtXml -I/usr/include/qt4/QtXmlPatterns -I/usr/include/qt4 -I. -I.
-LINK = g++
-LFLAGS = -Wl,-rpath,/usr/lib/qt4
-LIBS = $(SUBLIBS) -L/usr/lib/qt4 -lQtXmlPatterns -L/usr/lib/qt4 -lQtNetwork -lQtXml -lQtGui -L/usr/X11R6/lib -lQtCore -lgthread-2.0 -lrt -lglib-2.0 -lpthread
-AR = ar cqs
-RANLIB =
-QMAKE = /usr/bin/qmake
-TAR = tar -cf
-COMPRESS = gzip -9f
-COPY = cp -f
-SED = sed
-COPY_FILE = $(COPY)
-COPY_DIR = $(COPY) -r
-STRIP = strip
-INSTALL_FILE = install -m 644 -p
-INSTALL_DIR = $(COPY_DIR)
-INSTALL_PROGRAM = install -m 755 -p
-DEL_FILE = rm -f
-SYMLINK = ln -f -s
-DEL_DIR = rmdir
-MOVE = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = ./
-
-####### Files
-
-SOURCES = main.cpp \
- mainwindow.cpp \
- ../loader.cpp \
- alienmodel.cpp \
- towermodel.cpp \
- splashmodel.cpp \
- ../map.cpp \
- ../game_data.cpp moc_mainwindow.cpp \
- moc_loader.cpp \
- moc_alienmodel.cpp \
- moc_towermodel.cpp \
- moc_splashmodel.cpp \
- moc_map.cpp \
- moc_game_data.cpp \
- qrc_ADeditor.cpp
-OBJECTS = main.o \
- mainwindow.o \
- loader.o \
- alienmodel.o \
- towermodel.o \
- splashmodel.o \
- map.o \
- game_data.o \
- moc_mainwindow.o \
- moc_loader.o \
- moc_alienmodel.o \
- moc_towermodel.o \
- moc_splashmodel.o \
- moc_map.o \
- moc_game_data.o \
- qrc_ADeditor.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 \
- /usr/share/qt4/mkspecs/features/default_pre.prf \
- /usr/share/qt4/mkspecs/features/debug.prf \
- /usr/share/qt4/mkspecs/features/default_post.prf \
- /usr/share/qt4/mkspecs/features/warn_on.prf \
- /usr/share/qt4/mkspecs/features/qt.prf \
- /usr/share/qt4/mkspecs/features/unix/thread.prf \
- /usr/share/qt4/mkspecs/features/moc.prf \
- /usr/share/qt4/mkspecs/features/resources.prf \
- /usr/share/qt4/mkspecs/features/uic.prf \
- /usr/share/qt4/mkspecs/features/yacc.prf \
- /usr/share/qt4/mkspecs/features/lex.prf \
- /usr/share/qt4/mkspecs/features/include_source_dir.prf \
- ADeditor.pro
-QMAKE_TARGET = ADeditor
-DESTDIR =
-TARGET = ADeditor
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .o .c .cpp .cc .cxx .C
-
-.cpp.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cc.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cxx.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.C.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.c.o:
- $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
-
-####### Build rules
-
-all: Makefile $(TARGET)
-
-$(TARGET): ui_mainwindow.h $(OBJECTS)
- $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
-
-Makefile: ADeditor.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /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 \
- /usr/share/qt4/mkspecs/features/default_pre.prf \
- /usr/share/qt4/mkspecs/features/debug.prf \
- /usr/share/qt4/mkspecs/features/default_post.prf \
- /usr/share/qt4/mkspecs/features/warn_on.prf \
- /usr/share/qt4/mkspecs/features/qt.prf \
- /usr/share/qt4/mkspecs/features/unix/thread.prf \
- /usr/share/qt4/mkspecs/features/moc.prf \
- /usr/share/qt4/mkspecs/features/resources.prf \
- /usr/share/qt4/mkspecs/features/uic.prf \
- /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/qt4/libQtXmlPatterns.prl \
- /usr/lib/qt4/libQtNetwork.prl \
- /usr/lib/qt4/libQtCore.prl \
- /usr/lib/qt4/libQtXml.prl \
- /usr/lib/qt4/libQtGui.prl
- $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug QMLINSPECTOR_PATH=/usr/share/qtcreator/qmljsdebugger -o Makefile ADeditor.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:
-/usr/share/qt4/mkspecs/features/default_pre.prf:
-/usr/share/qt4/mkspecs/features/debug.prf:
-/usr/share/qt4/mkspecs/features/default_post.prf:
-/usr/share/qt4/mkspecs/features/warn_on.prf:
-/usr/share/qt4/mkspecs/features/qt.prf:
-/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/usr/share/qt4/mkspecs/features/moc.prf:
-/usr/share/qt4/mkspecs/features/resources.prf:
-/usr/share/qt4/mkspecs/features/uic.prf:
-/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/qt4/libQtXmlPatterns.prl:
-/usr/lib/qt4/libQtNetwork.prl:
-/usr/lib/qt4/libQtCore.prl:
-/usr/lib/qt4/libQtXml.prl:
-/usr/lib/qt4/libQtGui.prl:
-qmake: FORCE
- @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug QMLINSPECTOR_PATH=/usr/share/qtcreator/qmljsdebugger -o Makefile ADeditor.pro
-
-dist:
- @$(CHK_DIR_EXISTS) .tmp/ADeditor1.0.0 || $(MKDIR) .tmp/ADeditor1.0.0
- $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/ADeditor1.0.0/ && $(COPY_FILE) --parents mainwindow.h ../loader.h alienmodel.h towermodel.h splashmodel.h ../base_types.h ../map.h ../game_data.h .tmp/ADeditor1.0.0/ && $(COPY_FILE) --parents ADeditor.qrc .tmp/ADeditor1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp ../loader.cpp alienmodel.cpp towermodel.cpp splashmodel.cpp ../map.cpp ../game_data.cpp .tmp/ADeditor1.0.0/ && $(COPY_FILE) --parents mainwindow.ui .tmp/ADeditor1.0.0/ && $(COPY_FILE) --parents adeditor_ru.ts .tmp/ADeditor1.0.0/ && (cd `dirname .tmp/ADeditor1.0.0` && $(TAR) ADeditor1.0.0.tar ADeditor1.0.0 && $(COMPRESS) ADeditor1.0.0.tar) && $(MOVE) `dirname .tmp/ADeditor1.0.0`/ADeditor1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/ADeditor1.0.0
-
-
-clean:compiler_clean
- -$(DEL_FILE) $(OBJECTS)
- -$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
- -$(DEL_FILE) $(TARGET)
- -$(DEL_FILE) Makefile
-
-
-check: first
-
-mocclean: compiler_moc_header_clean compiler_moc_source_clean
-
-mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-
-compiler_moc_header_make_all: moc_mainwindow.cpp moc_loader.cpp moc_alienmodel.cpp moc_towermodel.cpp moc_splashmodel.cpp moc_map.cpp moc_game_data.cpp
-compiler_moc_header_clean:
- -$(DEL_FILE) moc_mainwindow.cpp moc_loader.cpp moc_alienmodel.cpp moc_towermodel.cpp moc_splashmodel.cpp moc_map.cpp moc_game_data.cpp
-moc_mainwindow.cpp: alienmodel.h \
- ../loader.h \
- ../game_data.h \
- ../player.h \
- ../base_types.h \
- ../map.h \
- towermodel.h \
- splashmodel.h \
- mainwindow.h
- /usr/bin/moc $(DEFINES) $(INCPATH) mainwindow.h -o moc_mainwindow.cpp
-
-moc_loader.cpp: ../game_data.h \
- ../player.h \
- ../base_types.h \
- ../map.h \
- ../loader.h
- /usr/bin/moc $(DEFINES) $(INCPATH) ../loader.h -o moc_loader.cpp
-
-moc_alienmodel.cpp: ../loader.h \
- ../game_data.h \
- ../player.h \
- ../base_types.h \
- ../map.h \
- alienmodel.h
- /usr/bin/moc $(DEFINES) $(INCPATH) alienmodel.h -o moc_alienmodel.cpp
-
-moc_towermodel.cpp: ../loader.h \
- ../game_data.h \
- ../player.h \
- ../base_types.h \
- ../map.h \
- towermodel.h
- /usr/bin/moc $(DEFINES) $(INCPATH) towermodel.h -o moc_towermodel.cpp
-
-moc_splashmodel.cpp: ../loader.h \
- ../game_data.h \
- ../player.h \
- ../base_types.h \
- ../map.h \
- splashmodel.h
- /usr/bin/moc $(DEFINES) $(INCPATH) splashmodel.h -o moc_splashmodel.cpp
-
-moc_map.cpp: ../base_types.h \
- ../map.h
- /usr/bin/moc $(DEFINES) $(INCPATH) ../map.h -o moc_map.cpp
-
-moc_game_data.cpp: ../player.h \
- ../base_types.h \
- ../map.h \
- ../game_data.h
- /usr/bin/moc $(DEFINES) $(INCPATH) ../game_data.h -o moc_game_data.cpp
-
-compiler_rcc_make_all: qrc_ADeditor.cpp
-compiler_rcc_clean:
- -$(DEL_FILE) qrc_ADeditor.cpp
-qrc_ADeditor.cpp: ADeditor.qrc \
- adeditor_ru.qm
- /usr/bin/rcc -name ADeditor ADeditor.qrc -o qrc_ADeditor.cpp
-
-compiler_image_collection_make_all: qmake_image_collection.cpp
-compiler_image_collection_clean:
- -$(DEL_FILE) qmake_image_collection.cpp
-compiler_moc_source_make_all:
-compiler_moc_source_clean:
-compiler_uic_make_all: ui_mainwindow.h
-compiler_uic_clean:
- -$(DEL_FILE) ui_mainwindow.h
-ui_mainwindow.h: mainwindow.ui
- /usr/bin/uic mainwindow.ui -o ui_mainwindow.h
-
-compiler_yacc_decl_make_all:
-compiler_yacc_decl_clean:
-compiler_yacc_impl_make_all:
-compiler_yacc_impl_clean:
-compiler_lex_make_all:
-compiler_lex_clean:
-compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_uic_clean
-
-####### Compile
-
-main.o: main.cpp mainwindow.h \
- alienmodel.h \
- ../loader.h \
- ../game_data.h \
- ../player.h \
- ../base_types.h \
- ../map.h \
- towermodel.h \
- splashmodel.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
-
-mainwindow.o: mainwindow.cpp mainwindow.h \
- alienmodel.h \
- ../loader.h \
- ../game_data.h \
- ../player.h \
- ../base_types.h \
- ../map.h \
- towermodel.h \
- splashmodel.h \
- ui_mainwindow.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp
-
-loader.o: ../loader.cpp ../loader.h \
- ../game_data.h \
- ../player.h \
- ../base_types.h \
- ../map.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o loader.o ../loader.cpp
-
-alienmodel.o: alienmodel.cpp alienmodel.h \
- ../loader.h \
- ../game_data.h \
- ../player.h \
- ../base_types.h \
- ../map.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o alienmodel.o alienmodel.cpp
-
-towermodel.o: towermodel.cpp towermodel.h \
- ../loader.h \
- ../game_data.h \
- ../player.h \
- ../base_types.h \
- ../map.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o towermodel.o towermodel.cpp
-
-splashmodel.o: splashmodel.cpp splashmodel.h \
- ../loader.h \
- ../game_data.h \
- ../player.h \
- ../base_types.h \
- ../map.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o splashmodel.o splashmodel.cpp
-
-map.o: ../map.cpp ../map.h \
- ../base_types.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o map.o ../map.cpp
-
-game_data.o: ../game_data.cpp ../game_data.h \
- ../player.h \
- ../base_types.h \
- ../map.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o game_data.o ../game_data.cpp
-
-moc_mainwindow.o: moc_mainwindow.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp
-
-moc_loader.o: moc_loader.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_loader.o moc_loader.cpp
-
-moc_alienmodel.o: moc_alienmodel.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_alienmodel.o moc_alienmodel.cpp
-
-moc_towermodel.o: moc_towermodel.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_towermodel.o moc_towermodel.cpp
-
-moc_splashmodel.o: moc_splashmodel.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_splashmodel.o moc_splashmodel.cpp
-
-moc_map.o: moc_map.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_map.o moc_map.cpp
-
-moc_game_data.o: moc_game_data.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_game_data.o moc_game_data.cpp
-
-qrc_ADeditor.o: qrc_ADeditor.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_ADeditor.o qrc_ADeditor.cpp
-
-####### Install
-
-install: FORCE
-
-uninstall: FORCE
-
-FORCE:
-
diff --git a/ADeditor/adeditor_ru.qm b/ADeditor/adeditor_ru.qm
new file mode 100644
index 0000000..68d3422
Binary files /dev/null and b/ADeditor/adeditor_ru.qm differ
diff --git a/ADeditor/adeditor_ru.ts b/ADeditor/adeditor_ru.ts
new file mode 100644
index 0000000..1268e62
--- /dev/null
+++ b/ADeditor/adeditor_ru.ts
@@ -0,0 +1,385 @@
+
+
+
+
+ Loader
+
+
+ Error Level %1 not found!
+
+
+
+
+ Loading level %1 ...
+
+
+
+
+ Error no waves on level!
+
+
+
+
+ Error wave %1 is empty!
+
+
+
+
+ load wave #%1 prise=%2 timeout=%3
+
+
+
+
+ Alien %1 #%2
+
+
+
+
+ Tower %1 trig=%2 splash=%3
+
+
+
+
+ chain lenght %1
+
+
+
+
+ Alien %1 id=%2 health=%3 speed=%4 prise=%5 imgType=%6 armor=%7 regeneration=%8 score=%10
+
+
+
+
+ Found %1 aliens
+
+
+
+
+ Wave %1 prise=%2 timeout=%3
+
+
+
+
+ Found %1 waves
+
+
+
+
+ Wave=%1 alien=%2 count=%3
+
+
+
+
+ Found %1 waveParts
+
+
+
+
+ Tower=%1 parent=%2 child=%3 trigger=%4
+
+
+
+
+ Found %1 chains
+
+
+
+
+ level=%1 wave=%2
+
+
+
+
+ Found %1 Waves On Level
+
+
+
+
+ level=%1 tower=%2
+
+
+
+
+ Found %1 Towers On Level
+
+
+
+
+ Level %1 id=%2 map=%3
+
+
+
+
+ Found %1 levels
+
+
+
+
+ Trigger %1 id=%2 damage=%3 radius=%4 delParent=%5 timer=%6
+
+
+
+
+ count=%1 chance=%2 randomPosRadius=%3 type=%4 childAim=%5
+
+
+
+
+ Found %1 triggers
+
+
+
+
+ Splash %1 id=%2 speed=%3 imgType=%4 autoControl=%5 lifetime=%6
+
+
+
+
+ Found %1 splashes
+
+
+
+
+ Tower %1 id=%2 radius=%3 cost=%4 reload=%5 buildTime=%6 splash=%7
+
+
+
+
+ imgType=%1 expByKill=%2 expByShot=%3 expByDamage=%4
+
+
+
+
+ Found %1 towers
+
+
+
+
+ Map %1 id=%2 imgType=%3 maxPlayers=%5 data=%6
+
+
+
+
+ Found %1 maps
+
+
+
+
+ MainWindow
+
+
+ MainWindow
+
+
+
+
+ Aliens
+ Монстры
+
+
+
+
+
+ Name
+ Имя
+
+
+
+ Health
+ Здоровье
+
+
+
+ Armor
+ Броня
+
+
+
+ Regeneration
+ Регенерация
+
+
+
+
+ Speed
+ Скорость
+
+
+
+ Prize
+ Награда
+
+
+
+ Score
+ Очки
+
+
+
+ Is Flying
+ Летающий
+
+
+
+
+
+ Image
+ Картинка
+
+
+
+
+
+ ...
+
+
+
+
+
+
+ Add
+ Добавить
+
+
+
+
+
+ Delete
+ Удалить
+
+
+
+ Towers
+ Башни
+
+
+
+ Build time
+ Время постройки
+
+
+
+ Cost
+ Цена
+
+
+
+ splash
+ снаряд
+
+
+
+ Edit
+ Ред.
+
+
+
+
+ Reload
+ Перезарядка
+
+
+
+ Radius
+ Радиус
+
+
+
+ ExpbyShot
+ Опыт за выстрел
+
+
+
+ ExpbyDam
+ Опыт за урон
+
+
+
+ ExpbyKill
+ Опыт за убийство
+
+
+
+ Splashes
+ Снаряды
+
+
+
+ LifeTime
+ Время жизни
+
+
+
+ AutoControl
+ Самонаведение
+
+
+
+ Tab 2
+
+
+
+
+ Save
+ Сохранить
+
+
+
+ Save changes?
+ Сохранить изменения?
+
+
+
+ All unsaved changes will be lost
+ Все несохранённые изменения будут потеряны
+
+
+
+
+
+
+ Are you sure?
+ Вы уверены?
+
+
+
+ Alien
+
+
+
+
+ Delete alien %1 id=%2
+ Удалить монстра %1 id=%2
+
+
+
+ Tower
+ Башня
+
+
+
+ Delete tower %1 id=%2
+ Удалить башню %1 id=%2
+
+
+
+ Splash
+ Снаряд
+
+
+
+ You can not delete splash %1 id=%2
+ Вы не можете удалить снаряд %1 id=%2
+
+
+
+ It used by tower %1
+ Используется башней %1
+
+
+
+ Delete splash %1 id=%2
+ Удалить снаряд %1 id=%2
+
+
+
diff --git a/AlienDefender-readme.txt b/AlienDefender-readme.txt
deleted file mode 100644
index de5d720..0000000
--- a/AlienDefender-readme.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-hello
-this is the source code of wavetrace(base part of game)
-to compilling this code you must have QT4 library and gcc compiller
-to make this project you cad do:
- $ qmake
- $ make
-or open the aliendefender.pro file in Qt-Creator and run aplication.
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..4633693
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 2.6)
+project(Alien_Defender)
+find_package(Qt4 REQUIRED)
+include_directories(${QT_INCLUDES})
+file(GLOB MOCS "./*.h")
+file(GLOB CPPS "./*.cpp")
+file(GLOB UIS "./*.ui")
+file(GLOB RES "./*.qrc")
+add_definitions(-Wall -O2 -g3 -ggdb)
+qt4_wrap_ui(CUIS ${UIS})
+qt4_wrap_cpp(CMOCS ${MOCS})
+qt4_add_resources(CRES ${RES})
+add_executable(AlienDefender ${CMOCS} ${CUIS} ${CPPS} ${CRES})
+target_link_libraries(AlienDefender ${QT_QTGUI_LIBRARY} ${QT_LIBRARIES} ${QT_QTXML_LIBRARY} ${QT_QTXMLPATTERNS_LIBRARY})
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 57b0a21..0000000
--- a/Makefile
+++ /dev/null
@@ -1,452 +0,0 @@
-#############################################################################
-# Makefile for building: aliendefender
-# Generated by qmake (2.01a) (Qt 4.7.0) on: ?? ???. 27 13:32:05 2010
-# Project: aliendefender.pro
-# Template: app
-# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug QMLINSPECTOR_PATH=/usr/share/qtcreator/qmljsdebugger QMLINSPECTOR_PATH=/usr/share/qtcreator/qmljsdebugger -o Makefile aliendefender.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC = gcc
-CXX = g++
-DEFINES = -DQT_XMLPATTERNS_LIB -DQT_XML_LIB -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS = -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS = -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtOpenGL -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtXmlPatterns -I/usr/include/qt4 -I/usr/X11R6/include -I.
-LINK = g++
-LFLAGS = -Wl,-rpath,/usr/lib/qt4
-LIBS = $(SUBLIBS) -L/usr/lib/qt4 -L/usr/X11R6/lib -lQtXmlPatterns -L/usr/lib/qt4 -lQtXml -lQtOpenGL -L/usr/X11R6/lib -lQtGui -lQtNetwork -lQtCore -lgthread-2.0 -lrt -lglib-2.0 -lGLU -lGL -lpthread
-AR = ar cqs
-RANLIB =
-QMAKE = /usr/bin/qmake
-TAR = tar -cf
-COMPRESS = gzip -9f
-COPY = cp -f
-SED = sed
-COPY_FILE = $(COPY)
-COPY_DIR = $(COPY) -r
-STRIP = strip
-INSTALL_FILE = install -m 644 -p
-INSTALL_DIR = $(COPY_DIR)
-INSTALL_PROGRAM = install -m 755 -p
-DEL_FILE = rm -f
-SYMLINK = ln -f -s
-DEL_DIR = rmdir
-MOVE = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = ./
-
-####### Files
-
-SOURCES = map.cpp \
- game_data.cpp \
- aliens.cpp \
- towers.cpp \
- main.cpp \
- splashes.cpp \
- adcore.cpp \
- player.cpp \
- loader.cpp \
- animation.cpp \
- ad_graphics.cpp moc_map.cpp \
- moc_game_data.cpp \
- moc_aliens.cpp \
- moc_towers.cpp \
- moc_splashes.cpp \
- moc_adcore.cpp \
- moc_player.cpp \
- moc_loader.cpp \
- moc_ad_graphics.cpp \
- qrc_images.cpp
-OBJECTS = map.o \
- game_data.o \
- aliens.o \
- towers.o \
- main.o \
- splashes.o \
- adcore.o \
- player.o \
- loader.o \
- animation.o \
- ad_graphics.o \
- moc_map.o \
- moc_game_data.o \
- moc_aliens.o \
- moc_towers.o \
- moc_splashes.o \
- moc_adcore.o \
- moc_player.o \
- moc_loader.o \
- moc_ad_graphics.o \
- qrc_images.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 \
- /usr/share/qt4/mkspecs/features/default_pre.prf \
- /usr/share/qt4/mkspecs/features/debug.prf \
- /usr/share/qt4/mkspecs/features/default_post.prf \
- /usr/share/qt4/mkspecs/features/warn_on.prf \
- /usr/share/qt4/mkspecs/features/qt.prf \
- /usr/share/qt4/mkspecs/features/unix/opengl.prf \
- /usr/share/qt4/mkspecs/features/unix/thread.prf \
- /usr/share/qt4/mkspecs/features/moc.prf \
- /usr/share/qt4/mkspecs/features/resources.prf \
- /usr/share/qt4/mkspecs/features/uic.prf \
- /usr/share/qt4/mkspecs/features/yacc.prf \
- /usr/share/qt4/mkspecs/features/lex.prf \
- /usr/share/qt4/mkspecs/features/include_source_dir.prf \
- aliendefender.pro
-QMAKE_TARGET = aliendefender
-DESTDIR =
-TARGET = aliendefender
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .o .c .cpp .cc .cxx .C
-
-.cpp.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cc.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cxx.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.C.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.c.o:
- $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
-
-####### Build rules
-
-all: Makefile $(TARGET)
-
-$(TARGET): $(OBJECTS)
- $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
-
-Makefile: aliendefender.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /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 \
- /usr/share/qt4/mkspecs/features/default_pre.prf \
- /usr/share/qt4/mkspecs/features/debug.prf \
- /usr/share/qt4/mkspecs/features/default_post.prf \
- /usr/share/qt4/mkspecs/features/warn_on.prf \
- /usr/share/qt4/mkspecs/features/qt.prf \
- /usr/share/qt4/mkspecs/features/unix/opengl.prf \
- /usr/share/qt4/mkspecs/features/unix/thread.prf \
- /usr/share/qt4/mkspecs/features/moc.prf \
- /usr/share/qt4/mkspecs/features/resources.prf \
- /usr/share/qt4/mkspecs/features/uic.prf \
- /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/qt4/libQtXmlPatterns.prl \
- /usr/lib/qt4/libQtNetwork.prl \
- /usr/lib/qt4/libQtCore.prl \
- /usr/lib/qt4/libQtXml.prl \
- /usr/lib/qt4/libQtOpenGL.prl \
- /usr/lib/qt4/libQtGui.prl
- $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug QMLINSPECTOR_PATH=/usr/share/qtcreator/qmljsdebugger QMLINSPECTOR_PATH=/usr/share/qtcreator/qmljsdebugger -o Makefile aliendefender.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:
-/usr/share/qt4/mkspecs/features/default_pre.prf:
-/usr/share/qt4/mkspecs/features/debug.prf:
-/usr/share/qt4/mkspecs/features/default_post.prf:
-/usr/share/qt4/mkspecs/features/warn_on.prf:
-/usr/share/qt4/mkspecs/features/qt.prf:
-/usr/share/qt4/mkspecs/features/unix/opengl.prf:
-/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/usr/share/qt4/mkspecs/features/moc.prf:
-/usr/share/qt4/mkspecs/features/resources.prf:
-/usr/share/qt4/mkspecs/features/uic.prf:
-/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/qt4/libQtXmlPatterns.prl:
-/usr/lib/qt4/libQtNetwork.prl:
-/usr/lib/qt4/libQtCore.prl:
-/usr/lib/qt4/libQtXml.prl:
-/usr/lib/qt4/libQtOpenGL.prl:
-/usr/lib/qt4/libQtGui.prl:
-qmake: FORCE
- @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug QMLINSPECTOR_PATH=/usr/share/qtcreator/qmljsdebugger QMLINSPECTOR_PATH=/usr/share/qtcreator/qmljsdebugger -o Makefile aliendefender.pro
-
-dist:
- @$(CHK_DIR_EXISTS) .tmp/aliendefender1.0.0 || $(MKDIR) .tmp/aliendefender1.0.0
- $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/aliendefender1.0.0/ && $(COPY_FILE) --parents base_types.h map.h game_data.h aliens.h towers.h splashes.h adcore.h player.h loader.h animation.h ad_graphics.h .tmp/aliendefender1.0.0/ && $(COPY_FILE) --parents images.qrc .tmp/aliendefender1.0.0/ && $(COPY_FILE) --parents map.cpp game_data.cpp aliens.cpp towers.cpp main.cpp splashes.cpp adcore.cpp player.cpp loader.cpp animation.cpp ad_graphics.cpp .tmp/aliendefender1.0.0/ && (cd `dirname .tmp/aliendefender1.0.0` && $(TAR) aliendefender1.0.0.tar aliendefender1.0.0 && $(COMPRESS) aliendefender1.0.0.tar) && $(MOVE) `dirname .tmp/aliendefender1.0.0`/aliendefender1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/aliendefender1.0.0
-
-
-clean:compiler_clean
- -$(DEL_FILE) $(OBJECTS)
- -$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
- -$(DEL_FILE) $(TARGET)
- -$(DEL_FILE) Makefile
-
-
-check: first
-
-mocclean: compiler_moc_header_clean compiler_moc_source_clean
-
-mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-
-compiler_moc_header_make_all: moc_map.cpp moc_game_data.cpp moc_aliens.cpp moc_towers.cpp moc_splashes.cpp moc_adcore.cpp moc_player.cpp moc_loader.cpp moc_ad_graphics.cpp
-compiler_moc_header_clean:
- -$(DEL_FILE) moc_map.cpp moc_game_data.cpp moc_aliens.cpp moc_towers.cpp moc_splashes.cpp moc_adcore.cpp moc_player.cpp moc_loader.cpp moc_ad_graphics.cpp
-moc_map.cpp: base_types.h \
- map.h
- /usr/bin/moc $(DEFINES) $(INCPATH) map.h -o moc_map.cpp
-
-moc_game_data.cpp: player.h \
- base_types.h \
- map.h \
- game_data.h
- /usr/bin/moc $(DEFINES) $(INCPATH) game_data.h -o moc_game_data.cpp
-
-moc_aliens.cpp: game_data.h \
- player.h \
- base_types.h \
- map.h \
- aliens.h
- /usr/bin/moc $(DEFINES) $(INCPATH) aliens.h -o moc_aliens.cpp
-
-moc_towers.cpp: game_data.h \
- player.h \
- base_types.h \
- map.h \
- towers.h
- /usr/bin/moc $(DEFINES) $(INCPATH) towers.h -o moc_towers.cpp
-
-moc_splashes.cpp: game_data.h \
- player.h \
- base_types.h \
- map.h \
- splashes.h
- /usr/bin/moc $(DEFINES) $(INCPATH) splashes.h -o moc_splashes.cpp
-
-moc_adcore.cpp: aliens.h \
- game_data.h \
- player.h \
- base_types.h \
- map.h \
- towers.h \
- splashes.h \
- loader.h \
- adcore.h
- /usr/bin/moc $(DEFINES) $(INCPATH) adcore.h -o moc_adcore.cpp
-
-moc_player.cpp: base_types.h \
- player.h
- /usr/bin/moc $(DEFINES) $(INCPATH) player.h -o moc_player.cpp
-
-moc_loader.cpp: game_data.h \
- player.h \
- base_types.h \
- map.h \
- loader.h
- /usr/bin/moc $(DEFINES) $(INCPATH) loader.h -o moc_loader.cpp
-
-moc_ad_graphics.cpp: adcore.h \
- aliens.h \
- game_data.h \
- player.h \
- base_types.h \
- map.h \
- towers.h \
- splashes.h \
- loader.h \
- animation.h \
- ad_graphics.h
- /usr/bin/moc $(DEFINES) $(INCPATH) ad_graphics.h -o moc_ad_graphics.cpp
-
-compiler_rcc_make_all: qrc_images.cpp
-compiler_rcc_clean:
- -$(DEL_FILE) qrc_images.cpp
-qrc_images.cpp: images.qrc \
- images/Aliens/Al_00_12.png \
- images/Aliens/Al_00_6.png \
- images/Aliens/Al_00_2.png \
- images/Aliens/Al_00_17.png \
- images/Aliens/Al_00_13.png \
- images/Aliens/Al_00_7.png \
- images/Aliens/Al_00_3.png \
- images/Aliens/Al_00_18.png \
- images/Aliens/Al_00_10.png \
- images/Aliens/Al_00_14.png \
- images/Aliens/Al_00_8.png \
- images/Aliens/Al_00_4.png \
- images/Aliens/Al_00_0.png \
- images/Aliens/Al_00_19.png \
- images/Aliens/Al_00_11.png \
- images/Aliens/Al_00_15.png \
- images/Aliens/Al_00_9.png \
- images/Aliens/Al_00_5.png \
- images/Aliens/Al_00_1.png \
- images/Aliens/Al_00_16.png
- /usr/bin/rcc -name images images.qrc -o qrc_images.cpp
-
-compiler_image_collection_make_all: qmake_image_collection.cpp
-compiler_image_collection_clean:
- -$(DEL_FILE) qmake_image_collection.cpp
-compiler_moc_source_make_all:
-compiler_moc_source_clean:
-compiler_uic_make_all:
-compiler_uic_clean:
-compiler_yacc_decl_make_all:
-compiler_yacc_decl_clean:
-compiler_yacc_impl_make_all:
-compiler_yacc_impl_clean:
-compiler_lex_make_all:
-compiler_lex_clean:
-compiler_clean: compiler_moc_header_clean compiler_rcc_clean
-
-####### Compile
-
-map.o: map.cpp map.h \
- base_types.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o map.o map.cpp
-
-game_data.o: game_data.cpp game_data.h \
- player.h \
- base_types.h \
- map.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o game_data.o game_data.cpp
-
-aliens.o: aliens.cpp aliens.h \
- game_data.h \
- player.h \
- base_types.h \
- map.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o aliens.o aliens.cpp
-
-towers.o: towers.cpp towers.h \
- game_data.h \
- player.h \
- base_types.h \
- map.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o towers.o towers.cpp
-
-main.o: main.cpp adcore.h \
- aliens.h \
- game_data.h \
- player.h \
- base_types.h \
- map.h \
- towers.h \
- splashes.h \
- loader.h \
- ad_graphics.h \
- animation.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
-
-splashes.o: splashes.cpp splashes.h \
- game_data.h \
- player.h \
- base_types.h \
- map.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o splashes.o splashes.cpp
-
-adcore.o: adcore.cpp adcore.h \
- aliens.h \
- game_data.h \
- player.h \
- base_types.h \
- map.h \
- towers.h \
- splashes.h \
- loader.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o adcore.o adcore.cpp
-
-player.o: player.cpp player.h \
- base_types.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o player.o player.cpp
-
-loader.o: loader.cpp loader.h \
- game_data.h \
- player.h \
- base_types.h \
- map.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o loader.o loader.cpp
-
-animation.o: animation.cpp animation.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o animation.o animation.cpp
-
-ad_graphics.o: ad_graphics.cpp ad_graphics.h \
- adcore.h \
- aliens.h \
- game_data.h \
- player.h \
- base_types.h \
- map.h \
- towers.h \
- splashes.h \
- loader.h \
- animation.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ad_graphics.o ad_graphics.cpp
-
-moc_map.o: moc_map.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_map.o moc_map.cpp
-
-moc_game_data.o: moc_game_data.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_game_data.o moc_game_data.cpp
-
-moc_aliens.o: moc_aliens.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_aliens.o moc_aliens.cpp
-
-moc_towers.o: moc_towers.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_towers.o moc_towers.cpp
-
-moc_splashes.o: moc_splashes.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_splashes.o moc_splashes.cpp
-
-moc_adcore.o: moc_adcore.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_adcore.o moc_adcore.cpp
-
-moc_player.o: moc_player.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_player.o moc_player.cpp
-
-moc_loader.o: moc_loader.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_loader.o moc_loader.cpp
-
-moc_ad_graphics.o: moc_ad_graphics.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_ad_graphics.o moc_ad_graphics.cpp
-
-qrc_images.o: qrc_images.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_images.o qrc_images.cpp
-
-####### Install
-
-install: FORCE
-
-uninstall: FORCE
-
-FORCE:
-
diff --git a/adgraphics.odp b/adgraphics.odp
new file mode 100644
index 0000000..5350e22
Binary files /dev/null and b/adgraphics.odp differ
diff --git a/aliendefender b/aliendefender
deleted file mode 100755
index c3072a0..0000000
Binary files a/aliendefender and /dev/null differ
diff --git a/aliendefender.kdev4 b/aliendefender.kdev4
new file mode 100644
index 0000000..ef3da10
--- /dev/null
+++ b/aliendefender.kdev4
@@ -0,0 +1,3 @@
+[Project]
+Manager=KDevCMakeManager
+Name=aliendefender
diff --git a/aliendefender.pro.user.2.2pre1 b/aliendefender.pro.user.2.2pre1
new file mode 100644
index 0000000..b421708
--- /dev/null
+++ b/aliendefender.pro.user.2.2pre1
@@ -0,0 +1,113 @@
+
+
+
+ ProjectExplorer.Project.ActiveTarget
+ 0
+
+
+ ProjectExplorer.Project.EditorSettings
+
+ System
+
+
+
+ ProjectExplorer.Project.Target.0
+
+ Настольный компьютер
+ Qt4ProjectManager.Target.DesktopTarget
+ 0
+ 0
+
+
+ qmake
+ QtProjectManager.QMakeBuildStep
+
+
+
+ Сборка
+ Qt4ProjectManager.MakeStep
+ false
+
+
+
+ 2
+
+ Сборка
+ Qt4ProjectManager.MakeStep
+ true
+
+ clean
+
+
+
+ 1
+ false
+
+ Отладка
+ Qt4ProjectManager.Qt4BuildConfiguration
+ 2
+ C:/Users/Andrey/Desktop/aliendefender-build-desktop
+ 9
+ 2
+ true
+
+
+
+ qmake
+ QtProjectManager.QMakeBuildStep
+
+
+
+ Сборка
+ Qt4ProjectManager.MakeStep
+ false
+
+
+
+ 2
+
+ Сборка
+ Qt4ProjectManager.MakeStep
+ true
+
+ clean
+
+
+
+ 1
+ false
+
+ Релиз
+ Qt4ProjectManager.Qt4BuildConfiguration
+ 0
+ C:/Users/Andrey/Desktop/aliendefender-build-desktop
+ 9
+ 2
+ true
+
+ 2
+
+ aliendefender
+ Qt4ProjectManager.Qt4RunConfiguration
+ 2
+
+ aliendefender.pro
+ false
+ false
+
+ false
+ true
+ C:\Users\Andrey\Desktop\aliendefender
+
+ 1
+
+
+
+ ProjectExplorer.Project.TargetCount
+ 1
+
+
+ ProjectExplorer.Project.Updater.FileVersion
+ 4
+
+