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

39 Commits

Author SHA1 Message Date
ViktorLjung e4a59cec61 Merge remote-tracking branch 'origin/master' into havok 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-05 06:01:49 +02:00
Jace 8b2fc86159 Main menu hidden for your debugging pleasure 2014-06-04 17:06:08 +02:00
Jace 5f1feffe0d Main menu finished 2014-06-04 16:59:30 +02:00
Jace 397188b855 Fixed frame scissor test 2014-06-04 00:46:03 +02:00
Jace 0addc672b4 Multiple vehicle selection 2014-06-03 20:36:35 +02:00
Jace 7f328332c4 Merge branch 'master' into particles 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-03 17:19:53 +02:00
Jace 0ad3d8ed76 Fixed vehicle selection hiding on selection 2014-06-03 03:55:35 +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
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 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
Jace a6906886f5 Vehicle selection! 2014-05-31 03:45:37 +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
Jace 6c8fff9ed0 Non-retardedly slow sprite rendering 2014-05-30 22:00:20 +02:00
Tleety 9ccf8ecc42 Fixed being able to draw sprites and normal/specular maps for terrain 2014-05-30 19:53:00 +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
Tleety cc84f04542 Transparent objects working. 2014-05-29 23:59:36 +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
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 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
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
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
Jace d259811795 Xbox360 controller support 2014-05-13 02:24:42 +02:00
Jace ad19848c1b WIP ECS GUI 2014-05-12 22:33:59 +02:00
Jace 41177581c6 WIP Render Queue 2014-05-11 01:46:02 +02:00
Jace 9e8c3161e0 WIP Frame 2014-04-29 13:58:37 +02:00
Jace dfd9425473 WIP Frame 2014-04-23 02:19:17 +02:00
Jace 1e2f7fdd5c Skeleton MessageRelay 2014-04-22 19:15:02 +02:00