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

286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tleety f5f6a5cf3a Fixed transparency 2014-06-02 22:15:52 +02:00
Tleety 179c5c1feb Merge remote-tracking branch 'origin/particles' into deffered_rendering 
Conflicts:
	assets
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-02 20:20:36 +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
Stiffly 349fab54a4 Merge remote-tracking branch 'origin/master' into particles 
Conflicts:
	src/GUI/GameFrame.h
	src/GUI/TextureFrame.h
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-02 17:37:25 +02:00
Jace 94fc516a69 Cleanup 2014-06-02 17:01:07 +02:00
Jace 27bfbd2025 Fixed free cam viewport toggle bug 2014-06-02 17:00:45 +02:00
Jace 61fab09ceb UI scaling properly 2014-06-02 16:10:52 +02:00
Jace 72420d4248 WIP Fullscreen Stuff (UI not scaling properly yet) 2014-06-01 03:05:42 +02:00
Tleety 0e2934647c Added a movable tree or somthing dunno lol tired-. 2014-06-01 03:01:37 +02:00
Stiffly 756107363e Some pretty darn cool explosions 2014-06-01 01:15:53 +02:00
Stiffly 804b0cac60 Now uses now sorts and renders sprites by depth. 
Merge remote-tracking branch 'origin/deffered_rendering' into particles

Conflicts:
	assets
	src/GameWorld.cpp
 2014-05-31 23:40:21 +02:00
Tleety 2d1d4f02f3 Fixed some things in gameworld and added a new skymap. 2014-05-31 23:14:33 +02:00
Stiffly cea2faaaf8 Removed unnecessary info messages 2014-05-31 23:14:13 +02:00
Tleety 1af8d4909a Fixed things with the skybox and placed some items in the world. 2014-05-31 23:14:11 +02:00
Stiffly d407502432 CreateExplosion event published on shell collision now. 2014-05-31 22:15:44 +02:00
Stiffly a31e3faa1f Linear fade added to particles 2014-05-31 22:15:00 +02:00
Tleety 6e78307249 Merge remote-tracking branch 'origin/master' into deffered_rendering 
Conflicts:
	src/GUI/GameFrame.h
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-31 17:16:29 +02:00
Tleety 260c1295ec WIP on deffered_rendering: a459a1c Skybox bugfix 2014-05-31 17:12:31 +02:00
Tleety 1b252c95e0 index on deffered_rendering: a459a1c Skybox bugfix 2014-05-31 17:12:31 +02:00
Tleety ad075f185e untracked files on deffered_rendering: a459a1c Skybox bugfix 2014-05-31 17:12:31 +02:00
Jace a6906886f5 Vehicle selection! 2014-05-31 03:45:37 +02:00
Tleety a459a1c69b Skybox bugfix 2014-05-31 02:03:50 +02:00
Tleety ee2f7fcecf Added some water to see how it looks 2014-05-31 01:11:14 +02:00
Stiffly 370dbb96ad Merge, now you can see sprites. 
Merge remote-tracking branch 'origin/deffered_rendering' into particles

Conflicts:
	src/GameWorld.cpp
 2014-05-31 00:00:00 +02:00
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
Jace 55db057e50 Texture error checking and removed redundant caching 2014-05-30 18:51:11 +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
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
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