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

335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tleety 0bba9e40d4 Merge branch 'deffered_rendering' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into deffered_rendering 
Conflicts:
	src/Renderer.cpp
 2014-05-30 22:47:23 +02:00
Tleety 0e612cb3f3 Colors now working correcly. 2014-05-30 22:45:00 +02:00
Stiffly 28c3cf5e16 Optimized ParticleSystem. Still can't see particles though D: 2014-05-30 22:19:03 +02:00
Jace 6c8fff9ed0 Non-retardedly slow sprite rendering 2014-05-30 22:00:20 +02:00
Stiffly dbebd5a6e9 Merge remote-tracking branch 'origin/deffered_rendering' into particles 2014-05-30 20:04:17 +02:00
Stiffly 31348e774e Trying some stuff, this build did not support sprite rendering 2014-05-30 20:00:09 +02:00
Tleety ed803733da Merged ASSets 2014-05-30 19:55:49 +02:00
Tleety 9ccf8ecc42 Fixed being able to draw sprites and normal/specular maps for terrain 2014-05-30 19:53:00 +02:00
Stiffly bf77fba963 Omg dem filter merge skillz 
Merge remote-tracking branch 'origin/deffered_rendering' into particles

Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp
	src/Systems/ParticleSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-30 19:11:52 +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
Jace 55db057e50 Texture error checking and removed redundant caching 2014-05-30 18:51:11 +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
Jace 701ca06a65 Crosshair 2014-05-30 01:03:59 +02:00
Jace 04a2642f85 Tank shell inheriting velocity 2014-05-30 01:00:22 +02:00
Stiffly d17450b554 Some Explosion stuff 2014-05-30 00:12:28 +02:00
Tleety cc84f04542 Transparent objects working. 2014-05-29 23:59:36 +02:00
Stiffly 128ff7ae4b I'm coming at you like a dark horse 2014-05-29 21:40:51 +02:00
ViktorLjung a1149394bb Gate working 2014-05-29 21:25:30 +02:00
Stiffly 2ec484c906 Uses an enumerator to seperate 3D and 2D sound instead of the path name. 2014-05-29 21:25:21 +02:00
Stiffly 03d6594f9a Loads BGM and SFX sounds differently depending on path to sound file. 2014-05-29 19:10:22 +02:00
Stiffly 4012edfd43 Added Stop Sound event. 2014-05-29 18:22:45 +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
Stiffly 1b2f930afa Separated PlaySound into PlaySFX and PlayBGM. 2014-05-28 22:06:26 +02:00
Jace ef0ff5a99b WIP Awesometastic debugging 2014-05-28 22:05:17 +02:00
ViktorLjung 651e62ba94 Camera on tank barrel 2014-05-28 20:40:15 +02:00
ViktorLjung 75e8ae0265 Merge remote-tracking branch 'origin/gui' into havok 2014-05-28 20:29:28 +02:00
ViktorLjung 133473b00e Tanksteering improved 2014-05-28 20:28:48 +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
Tleety a5f4c9daa0 Fixed so OBJ-loader now loads map_Bump options correctly. 2014-05-28 20:05:28 +02:00
Stiffly 1a043ab411 Using ResourceManager for cached laoding of sounds. 2014-05-28 19:56:28 +02:00
Jace f813f8d2ca What is this I don't even *falls asleep* 2014-05-27 10:25:52 +02:00
Jace f31b2b7ddb Merge branch 'render_queue' 
Conflicts:
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Shaders/Fragment.glsl
	src/Systems/PhysicsSystem.h
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-27 09:35:52 +02:00
ViktorLjung f775864ed2 Fishy 2014-05-27 09:10:59 +02:00
Stiffly 599e0c9bf0 Removed temporary event publishing code for PlaySound. 2014-05-27 08:53:12 +02:00
Stiffly 6cb802c845 Removed OpenAL. Added FMOD dll to batch file. 2014-05-27 08:48:48 +02:00
Jace 7b622d530b No shadows and no skybox. 2014-05-27 08:35:39 +02:00
Jace 98167a806d Merge remote-tracking branch 'origin/deffered_rendering' into render_queue 
Conflicts:
	src/Renderer.cpp
	src/Renderer.h
 2014-05-27 07:10:50 +02:00
Stiffly 571edbc214 ... even more event-based 2014-05-27 07:09:22 +02:00
Stiffly 5d53472286 CreateExplosion now Event-based (not tested) 2014-05-27 07:08:39 +02:00
ViktorLjung c37df5c178 Damage and Spashdamage working, phantomShapes not really working 2014-05-27 07:04:29 +02:00
Stiffly 4b2f324d60 Merge remote-tracking branch 'origin/master' into particles 
Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp
 2014-05-27 06:55:44 +02:00
Jace d4b28a2228 Semi-working world rendering 2014-05-27 06:45:26 +02:00
Stiffly 7e995fc8b7 Fixed bug. Sound not longer always in origin. 2014-05-27 06:05:47 +02:00