BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
388 Commits 15 Branches 0 Tags
3f6933da760f4f6c846e770a91170113b6b748a6
Commit Graph

136 Commits

Author SHA1 Message Date
Tleety 3f6933da76 tower destroy debris 2014-06-05 06:13:51 +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 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
Jace 866c65514d Decorations! 2014-06-05 03:54:41 +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
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 d3f8ef2d9c Wallz 2014-06-04 06:20:22 +02:00
ViktorLjung 94178098ea Merge remote-tracking branch 'origin/master' into havok 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-04 05:48:48 +02:00
Jace 62dd85349f A gate and better bridges. 2014-06-04 05:47:29 +02:00
ViktorLjung f9f20535ba Jeep and tank tuning 2014-06-04 05:47:17 +02:00
Jace 3c17ab6037 Bridges 2014-06-04 05:12:06 +02:00
Jace e11f656b3d Fixed physics relative orientations! 2014-06-04 04:18:44 +02:00
ViktorLjung ac855f554b Fixed local physics orientation 2014-06-04 00:45:43 +02:00
Jace 80846a29ad Terrain creation stuff 2014-06-03 20:36:23 +02:00
Jace aeb29cde8b Merge branch 'deffered_rendering' 
Conflicts:
	assets
	src/Components/Physics.h
	src/GameWorld.cpp
	src/GameWorld.h
	src/Systems/PhysicsSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-03 18:46:49 +02:00
Jace 4596fffb91 Vehicle spawning 2014-06-03 03:55:34 +02:00
Jace 46f377c94c Interface input revised 2014-06-03 03:55:34 +02:00
Tleety f5f6a5cf3a Fixed transparency 2014-06-02 22:15:52 +02:00
Tleety f1a9afc097 Fixed a createWall function. 2014-06-02 20:01:28 +02:00
Tleety 00268f027a Walls are now destroyable! 2014-06-02 18:21:39 +02:00
ViktorLjung 2f2154ffe1 Kind of retarded tank 2014-06-02 17:50:46 +02:00
ViktorLjung d64be64ba4 Garage working, ready for vehicle swap implementation 2014-06-01 03:07:47 +02:00
Tleety 0e2934647c Added a movable tree or somthing dunno lol tired-. 2014-06-01 03:01:37 +02:00
Tleety 2d1d4f02f3 Fixed some things in gameworld and added a new skymap. 2014-05-31 23:14:33 +02:00
Tleety 260c1295ec WIP on deffered_rendering: a459a1c Skybox bugfix 2014-05-31 17:12:31 +02:00
ViktorLjung a142d368a7 Movement/rotation queue fixed and Simon force push 2014-05-31 03:55:23 +02:00
Tleety ee2f7fcecf Added some water to see how it looks 2014-05-31 01:11:14 +02:00
Tleety 0e612cb3f3 Colors now working correcly. 2014-05-30 22:45:00 +02:00
Tleety 9ccf8ecc42 Fixed being able to draw sprites and normal/specular maps for terrain 2014-05-30 19:53:00 +02:00
ViktorLjung c489547294 Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-30 19:05:52 +02:00
ViktorLjung aeaadcba0f Gate fixed 2014-05-30 18:44:53 +02:00
Jace 235a03ab4c Tank wheel pair! 2014-05-30 01:04:09 +02:00
Tleety cc84f04542 Transparent objects working. 2014-05-29 23:59:36 +02:00
ViktorLjung a1149394bb Gate working 2014-05-29 21:25:30 +02:00
Jace 2a28423cd5 Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok 
Conflicts:
	src/GameWorld.cpp
 2014-05-29 17:46:30 +02:00
Jace 0db4ebea95 WIP WheelPair 2014-05-29 17:45:27 +02:00
ViktorLjung 04b15fe92a Velocity now updating in transformcomponent 2014-05-29 17:45:26 +02:00