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

211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jace d4b28a2228 Semi-working world rendering 2014-05-27 06:45:26 +02:00
Jace 74239300bd Merge commit 'e3aab96a750d6e5d6f8ff42ffdb5a23a47ab929d' into render_queue 
Conflicts:
	assets
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Renderer.h
	src/Systems/RenderSystem.cpp
 2014-05-26 04:21:08 +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
Jace 07c74ff9f5 I'll create a GUI interface using Visual Basic, see if I can track an IP address 2014-05-25 04:12:28 +02:00
Tleety e3aab96a75 Fixed forward rendering for transparensy 2014-05-25 01:52:57 +02:00
Jace 2fbcad4dbf Layer in render queue? 2014-05-24 20:32:54 +02:00
Jace 1bf5a8464e Merge branch 'events' 2014-05-23 23:42:00 +02:00
Jace e48df894cf Better events 2014-05-23 23:41:34 +02:00
Tleety a9f2911e41 Shadows working, and looking totaly not shit. 
Improved location of the shadowmap to always be infront of the camera.
 2014-05-23 22:42:11 +02:00
Jace 4102756e33 Beautifully broken 2014-05-22 22:04:54 +02:00
Tleety dbad1ee7f5 Work done on light and shadows. 2014-05-21 16:51:05 +02:00
Tleety e414087816 Some work done on lights and normals and other buggs/fixes 2014-05-20 03:33:42 +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
ViktorLjung ec74d700be fix 2014-05-19 21:57:13 +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
Tleety 82d5953c97 Specular maps working. 2014-05-19 21:36:28 +02:00
ViktorLjung 7f77db97a0 Convert functions working in debug 2014-05-19 19:59:17 +02:00
Jace bd7ba73bca Split screen working 2014-05-19 17:20:43 +02:00
Jace e07a0a2b1a More viewport stuff 2014-05-19 04:29:30 +02:00
Jace 3023391358 Merge remote-tracking branch 'origin/deffered_rendering' into gui 
Conflicts:
	assets
	src/GameWorld.cpp
 2014-05-19 03:15:40 +02:00
Tleety 7455f4b865 NormalMaps Working and started work on specular maps. 2014-05-19 01:01:46 +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 f14a83caa8 Assets 2014-05-18 23:59:18 +02:00
ViktorLjung 02243becee Recoil while firing, clamp inputs, merge Helicopter 2014-05-18 23:54:01 +02:00
ViktorLjung 85e5d7461c Merge remote-tracking branch 'origin/vehicle-helicopter' into havok 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
 2014-05-18 21:09:08 +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
Tleety 2520fba1b4 Merge remote-tracking branch 'origin/master' into deffered_rendering 
Conflicts:
	assets
 2014-05-17 18:10:48 +02:00
ViktorLjung 4d15d3e02c Collision callbacks 2014-05-17 18:06:56 +02:00
Tleety 67778f391a Working on shadows 2014-05-17 18:02:10 +02:00
Jace 542ad075ea ECS improved to make it less annoying to use 
AddComponent<Components::Transform>(entity, "Transform")
is now
AddComponent<Components::Transform>(entity)
etc.
 2014-05-17 17:46:17 +02:00
Jace 16d51c64c5 Meh-ish helicopter physics 2014-05-17 03:49:53 +02:00
Jace add27aa8f4 Back to working order 2014-05-17 01:21:40 +02:00
Jace d98badc59a Latest assets 2014-05-17 00:57:24 +02:00
Jace f180abcd63 Input System improved to allow for multiple inputs for same bind 
Did not work properly between keyboard and controller before.
 2014-05-17 00:53:51 +02:00
Jace 2a28f65c37 FreeSteeringSystem updated to allow for controller input 2014-05-17 00:50:45 +02:00
Jace 33b14b1859 Mouse locking event 2014-05-17 00:49:23 +02:00
Jace 44e376e815 Pls go away 2014-05-16 02:13:28 +02:00
Jace 9723d80742 And then Microsoft happened... 2014-05-15 21:50:49 +02:00
Jace 6684aa06b7 Merge branch 'master' into gui 
Conflicts:
	src/GUI/Frame.h
	src/InputManager.cpp
 2014-05-15 21:16:43 +02:00
ViktorLjung 05757b6112 assets 2014-05-15 19:30:44 +02:00
Jace bafa8d0a5d Merge remote-tracking branch 'origin/deffered_rendering' 
Conflicts:
	assets
	src/Components/PointLight.h
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Renderer.h
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-13 04:07:24 +02:00
ViktorLjung ab58cbc08d Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-13 03:36:09 +02:00
ViktorLjung ce5b62cf6d Shots fired! （ ﾟДﾟ） 2014-05-13 03:32:58 +02:00
Jace d259811795 Xbox360 controller support 2014-05-13 02:24:42 +02:00
ViktorLjung 74d3269e35 Merge remote-tracking branch 'origin/particles' into havok 
Conflicts:
	src/Components/Vehicle.h
 2014-05-13 01:57:28 +02:00
Stiffly df13663ca8 Two emitters and following camera 2014-05-13 01:56:00 +02:00