foop - FOOP repository

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of ssh://manuel.mausz.at/foop	manuel	2011-04-09	12	-188/+332
\|\ \| \| \| \| \| \| \| \|	Conflicts: pacman-c++/pacman.pro
\| *	Pull up methods from mainwidget to sceneholder for sharing in both client ↵	totycro	2011-04-09	12	-188/+332
\| \| \| \| \| \| \| \|	and server
* \|	add toggle audio icon	manuel	2011-04-09	11	-8/+118
\|/
*	collision detection fix	manuel	2011-04-09	6	-6/+31
\|
*	.	manuel	2011-04-09	1	-1/+1
\|
*	fix sound (again)	manuel	2011-04-09	5	-4/+18
\|
*	fix + test	manuel	2011-04-09	2	-2/+7
\|
*	fix move sound	manuel	2011-04-09	1	-6/+7
\|
*	Merge branch 'master' of ssh://manuel.mausz.at/foop	manuel	2011-04-09	2	-2/+41
\|\
\| *	tried to make movement more smooth	totycro	2011-04-09	2	-2/+41
\| \|
* \|	add aboutToFinish to audioplayer	manuel	2011-04-09	2	-0/+8
\|/
*	if you want debug, use: qmake CONFIG+=debug	manuel	2011-04-08	1	-2/+0
\|
*	Merge branch 'master' of ssh://manuel.mausz.at/foop	manuel	2011-04-08	1	-0/+2
\|\
\| *	added debug to pro file	totycro	2011-04-08	1	-0/+2
\| \|
* \|	make audioplayer useful	manuel	2011-04-08	7	-43/+123
\|/
*	fix window title	manuel	2011-04-08	3	-9/+9
\|
*	fixing app icon on windows	manuel	2011-04-07	7	-12/+104
\| \| \| \|	add audio player
*	- make player icons a bit nicer (on windows too)	manuel	2011-04-07	4	-20/+26
\| \| \| \|	- we don't build DEBUG by default (makes windows go crazy)
*	adding application icon	manuel	2011-04-07	11	-7/+56
\| \| \| \|	and trying to add actor icon. but this is really hackish
*	final demo map	manuel	2011-04-07	2	-168/+47
\|
*	add some sounds	manuel	2011-04-07	7	-15/+101
\|
*	fix points size	manuel	2011-04-07	1	-0/+0
\|
*	adding normal points	manuel	2011-04-07	8	-13/+59
\|
*	we love pacmans!!	manuel	2011-04-06	1	-2/+2
\|
*	- make a few optimizations to actor sprites	manuel	2011-04-06	9	-56/+203
\| \| \| \|	- make actor move via keyboard!
*	Merge branch 'master' of ssh://manuel.mausz.at/foop	manuel	2011-04-06	2	-6/+6
\|\ \| \| \| \| \| \| \| \|	Conflicts: pacman-c++/mainwidget.cpp
\| *	Fixed size for drawing area	totycro	2011-04-06	2	-8/+8
\| \|
* \|	make pictures color index based	manuel	2011-04-06	13	-103/+34
\|/
*	sample map	manuel	2011-04-06	2	-24/+165
\|
*	Keep track of PixmapItems in client	totycro	2011-04-06	2	-2/+13
\|
*	merge 4	totycro	2011-04-06	1	-0/+1
\|
*	merge 3	totycro	2011-04-06	1	-1/+0
\|
*	merge 2	totycro	2011-04-06	1	-0/+1
\|
*	merge	totycro	2011-04-06	6	-16/+24
\|
*	Merge branch 'master' of ssh://manuel.mausz.at/foop	manuel	2011-04-06	6	-98/+110
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: pacman-c++/actor.cpp pacman-c++/constants.h pacman-c++/mainwidget.cpp
\| *	Cleaned up constants	totycro	2011-04-06	5	-81/+94
\| \|
* \|	adding nicer blocks :D	manuel	2011-04-06	11	-9/+43
\|/
*	some minor cleanup	manuel	2011-04-06	7	-35/+48
\|
*	added key handling	totycro	2011-04-05	2	-0/+54
\|
*	added menubar	totycro	2011-04-05	2	-9/+9
\|
*	Added simple scorebox	totycro	2011-04-05	3	-11/+51
\|
*	add icon method for actor	manuel	2011-04-05	2	-0/+11
\|
*	forgot some commits..	manuel	2011-04-05	8	-19/+27
\| \| \| \|	replace std::map with QMap
*	adding random bonuspoints :)	manuel	2011-04-05	3	-0/+0
\|
*	- we love ogg, we hate mp3/wav	manuel	2011-04-05	27	-99/+114
\| \| \| \| \|	- a lot of coding style/intent fix - add constant.h to pro files
*	Fixed a minor issue	totycro	2011-04-05	3	-6/+4
\|
*	Support actor in map	totycro	2011-04-04	7	-26/+62
\|
*	Use only 1 color format for everything	totycro	2011-04-04	18	-31/+139
\| \| \| \|	Simple map parsing for Blocks and Bonus points
*	fix pro files	manuel	2011-04-04	2	-18/+20
\|
*	change project file:	totycro	2011-04-04	7	-2/+141
\| \| \| \| \| \| \| \| \|	use: qmake -config client or qmake -config main Added basic client gui infrastructure