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

116 Commits

Author SHA1 Message Date
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
Jace 62dd85349f A gate and better bridges. 2014-06-04 05:47:29 +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
ViktorLjung b8ec7e1dbd Gate half done 2014-05-29 17:40:48 +02:00
ViktorLjung fd188fded6 Velocity now updating in transformcomponent 2014-05-28 22:09:54 +02:00
Tleety eb37cc2296 Fixed blendmaps 
Merge remote-tracking branch 'origin/gui' into deffered_rendering

Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-28 22:08:50 +02:00
ViktorLjung 651e62ba94 Camera on tank barrel 2014-05-28 20:40:15 +02:00
Tleety 761b8e21e1 Added blendmap component 
Added renderque for models with a blendmap component
Added shaders for blendmaps
 2014-05-28 20:24:31 +02:00
Jace cc42b94000 Viewports fixed. Damage HUD. Free steering fixed. 2014-05-28 20:22:38 +02:00
Jace f813f8d2ca What is this I don't even *falls asleep* 2014-05-27 10:25:52 +02:00
Jace 7b622d530b No shadows and no skybox. 2014-05-27 08:35:39 +02:00
Jace d4b28a2228 Semi-working world rendering 2014-05-27 06:45:26 +02:00
Jace 22442708cc One hell of a GUI interface (minus graphical) 
"how does this even work lol"
 2014-05-26 03:33:11 +02:00
ViktorLjung 609687d6b4 MULTIPLAYER 2014-05-20 01:43:59 +02:00
ViktorLjung ff58f881ae Merge branch 'havok' into gui 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-19 22:06:04 +02:00
Jace 40718407ac Merge remote-tracking branch 'origin/master' into gui 
Conflicts:
	src/GameWorld.cpp
	src/InputManager.cpp
	src/Systems/RenderSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-19 21:51:25 +02:00
Jace bd7ba73bca Split screen working 2014-05-19 17:20:43 +02:00
ViktorLjung 998ee3cfab Brakes working 2014-05-19 00:58:48 +02:00
Jace 539196cd45 Viewport stuff 2014-05-19 00:55:58 +02:00
ViktorLjung 02243becee Recoil while firing, clamp inputs, merge Helicopter 2014-05-18 23:54:01 +02:00
ViktorLjung fd0bb18bd3 tank stuff 2014-05-18 21:07:03 +02:00
Jace a36d6c554a Merge branch 'master' into havok 
Conflicts:
	assets
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-17 21:23:46 +02:00
ViktorLjung a8ecacab11 tank steering 2014-05-17 18:45:54 +02:00