 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
|
cc42b94000
|
Viewports fixed. Damage HUD. Free steering fixed.
|
2014-05-28 20:22:38 +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 |
|
|
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 |
|
|
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 |
|
|
ViktorLjung
|
a674295a83
|
Collisionfilters
|
2014-05-22 22:05:06 +02:00 |
|
|
ViktorLjung
|
7e5cf8efaa
|
Fuckhack
|
2014-05-20 03:41:10 +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 |
|
|
ViktorLjung
|
02243becee
|
Recoil while firing, clamp inputs, merge Helicopter
|
2014-05-18 23:54:01 +02:00 |
|
|
Jace
|
16d51c64c5
|
Meh-ish helicopter physics
|
2014-05-17 03:49:53 +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
|
33b14b1859
|
Mouse locking event
|
2014-05-17 00:49:23 +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
|
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 |
|
|
Jace
|
d259811795
|
Xbox360 controller support
|
2014-05-13 02:24:42 +02:00 |
|
|
ViktorLjung
|
b9231e4d46
|
Shots need more work
|
2014-05-13 01:50:58 +02:00 |
|
|
Jace
|
ad19848c1b
|
WIP ECS GUI
|
2014-05-12 22:33:59 +02:00 |
|
|
ViktorLjung
|
38482431a1
|
Tank tower and barrel steering working
|
2014-05-12 22:33:53 +02:00 |
|
|
ViktorLjung
|
2aa51c3e90
|
Tank sterring event-based
|
2014-05-12 14:04:55 +02:00 |
|
|
Jace
|
8c8edd0e8e
|
WIP InputController for easier command handling in systems
|
2014-05-06 14:33:02 +02:00 |
|
|
Jace
|
0e068be77b
|
Basic input binding and command publishing system
|
2014-05-05 09:17:58 +02:00 |
|
|
Jace
|
5e7537b903
|
Input events moved from InputSystem to new InputManager
|
2014-05-05 07:16:45 +02:00 |
|
|
Jace
|
57d29d0db7
|
Started implementation of events for InputSystem and SoundSystem
|
2014-04-28 19:55:31 +02:00 |
|