BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
409 Commits 15 Branches 0 Tags
53e137f50db5918f12d8aa053d3b83745976beab
Commit Graph

409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jace 53e137f50d Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance 
Conflicts:
	src/Systems/PhysicsSystem.cpp
 2014-06-05 16:45:50 +02:00
Jace 428ad2bae0 Fixez 2014-06-05 16:45:15 +02:00
Jace 2f0d17a386 Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance 2014-06-05 16:27:03 +02:00
Jace 09bbb5ac0b Proper entity removal. 2014-06-05 16:26:01 +02:00
Tleety e42c2c49ef Light on tank shells 2014-06-05 16:25:20 +02:00
Stiffly 2f617727a4 dead in water 2014-06-05 07:05:55 +02:00
Stiffly 9a7d0463a0 Merge remote-tracking branch 'origin/master' into Sound+Particles 2014-06-05 07:01:53 +02:00
Stiffly 7b5e0045f6 broken one deadn 2014-06-05 07:01:33 +02:00
ViktorLjung 75a19fbfe0 Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance 2014-06-05 06:57:46 +02:00
ViktorLjung 36ecbf8b73 Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance 2014-06-05 06:56:53 +02:00
ViktorLjung d3dca03f47 fix 2014-06-05 06:56:42 +02:00
Tleety 83e28d48f8 Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance 2014-06-05 06:54:27 +02:00
Tleety b4cec1747e turrets now aiming as they should 2014-06-05 06:53:34 +02:00
ViktorLjung ce2e0b192c Merge remote-tracking branch 'origin/master' into havok 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-05 06:46:05 +02:00
ViktorLjung 97994f9af7 Collisions 2014-06-05 06:42:19 +02:00
Tleety 4d5c4c8fc7 Added towers to the map 2014-06-05 06:25:12 +02:00
Tleety 7773580da6 Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance 2014-06-05 06:14:00 +02:00
Tleety 3f6933da76 tower destroy debris 2014-06-05 06:13:51 +02:00
ViktorLjung a001cad9bc Merge branch 'master' into havok 
Conflicts:
	src/GameWorld.cpp
	src/Systems/GameStateSystem.cpp
	src/Systems/TankSteeringSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-05 06:04:32 +02:00
ViktorLjung e4a59cec61 Merge remote-tracking branch 'origin/master' into havok 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-05 06:01:49 +02:00
Jace 41ca0e832f Merge branch 'deffered_rendering' 2014-06-05 05:58:57 +02:00
Jace dcede48453 Fixed particles not rendering over skybox 2014-06-05 05:53:13 +02:00
Tleety 8f1f87512f Merge remote-tracking branch 'origin/Sound+Particles' 2014-06-05 05:22:33 +02:00
Tleety c7a37e1b9b Merge remote-tracking branch 'origin/master' into deffered_rendering 2014-06-05 05:21:28 +02:00
Tleety 85d5f209a3 Merge branch 'deffered_rendering' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into deffered_rendering 2014-06-05 05:21:09 +02:00
Tleety fd92f37902 Skybox working, flag for averaging normals working. 2014-06-05 05:20:51 +02:00
Stiffly 16e4129d70 Merge remote-tracking branch 'origin/master' into Sound+Particles 
Conflicts:
	src/Components/Vehicle.h
	src/Systems/TankSteeringSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-05 05:16:57 +02:00
Stiffly ccc2c49317 Vehicle component has "CurrentRPM" 2014-06-05 05:11:04 +02:00
Jace 9ed2f04036 Fixed particles not rendering to both viewports 2014-06-05 04:50:06 +02:00
Jace 866c65514d Decorations! 2014-06-05 03:54:41 +02:00
Stiffly 09971b2d77 Publishes some bgm sounds 2014-06-05 03:14:45 +02:00
Tleety a6941c0fb6 Merge remote-tracking branch 'origin/master' into deffered_rendering 
Conflicts:
	src/GameWorld.cpp
	src/GameWorld.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-05 03:03:00 +02:00
Tleety ccb3d6d84f Turret able to shoot, no collision event yet. 2014-06-05 02:54:44 +02:00
Tleety 93c4805a22 Tower not aiming towards the player. 2014-06-05 00:35:15 +02:00
Jace 56e6545f0f Direct damage and VulnerableToSplash flag on Health component 2014-06-04 23:54:52 +02:00
Jace 2d716e2998 Merge branch 'master' into havok 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-04 22:01:25 +02:00
Stiffly 76a9081d4b Merge remote-tracking branch 'origin/master' into Sound+Particles 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-04 18:22:16 +02:00
Stiffly 6e9eeaf991 Dust particles from tank wheels. 2014-06-04 18:15:47 +02:00
ViktorLjung 1b20204897 Player/Team specific triggers 2014-06-04 18:12:58 +02:00
Jace bf5106e5b6 Merge remote-tracking branch 'origin/deffered_rendering' 2014-06-04 17:14:34 +02:00
Jace 8b2fc86159 Main menu hidden for your debugging pleasure 2014-06-04 17:06:08 +02:00
Jace 5f1feffe0d Main menu finished 2014-06-04 16:59:30 +02:00
ViktorLjung c06c436cd1 Merge remote-tracking branch 'origin/master' into havok 2014-06-04 15:43:51 +02:00
ViktorLjung 70960c9eba Jeep working 2014-06-04 15:43:20 +02:00
Stiffly f2ae46efa5 Merge remote-tracking branch 'origin/master' into Sound+Particles 2014-06-04 15:22:00 +02:00
Stiffly 2ef5d49f7e Added Destructor. (improved StopSound and PlayBGM events) 2014-06-04 15:21:05 +02:00
Tleety 6cae09c5d8 Walls are now destroyable 2014-06-04 14:48:40 +02:00
Jace 7b90e54899 Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance 2014-06-04 13:40:23 +02:00
Jace d3f8ef2d9c Wallz 2014-06-04 06:20:22 +02:00
Stiffly f9426745f7 Merge remote-tracking branch 'origin/master' into Sound+Particles 
Conflicts:
	assets
 2014-06-04 06:17:05 +02:00