 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 |
|
 Stiffly
|
1a52b1d04c
|
finlir
|
2014-05-18 20:32:10 +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 |
|
|
ViktorLjung
|
b9231e4d46
|
Shots need more work
|
2014-05-13 01:50:58 +02:00 |
|
|
Tleety
|
ccd1393dac
|
Fixed some shadow buggs.
|
2014-05-12 23:02:19 +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
|
92e9fd1049
|
fixup! Fixed relative transform rotations (For real this time?)
|
2014-05-12 22:24:53 +02:00 |
|
|
Stiffly
|
19a2879104
|
Emitter childed to a wheel. BUG FIXED: Billboarding calculation.
|
2014-05-12 22:21:27 +02:00 |
|
|
ViktorLjung
|
ddc41b88a7
|
Fixed relative transform rotations (For real this time?)
|
2014-05-12 22:15:21 +02:00 |
|
|
Stiffly
|
5d48ea7e2a
|
not reversed input for Camera...
|
2014-05-12 22:05:56 +02:00 |
|
|
Tleety
|
4639a6e4c3
|
Working shadows, however ugly they are.
|
2014-05-12 18:03:39 +02:00 |
|
|
Stiffly
|
457ee84903
|
Merge remote-tracking branch 'origin/havok' into particles
Conflicts:
src/Components/Vehicle.h
|
2014-05-12 15:43:41 +02:00 |
|
|
ViktorLjung
|
2aa51c3e90
|
Tank sterring event-based
|
2014-05-12 14:04:55 +02:00 |
|
|
ViktorLjung
|
c8a77d5c3d
|
Merge remote-tracking branch 'origin/master' into havok
Conflicts:
assets
src/GameWorld.cpp
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-05-12 14:03:02 +02:00 |
|
|
Stiffly
|
e0b5b72454
|
Merge remote-tracking branch 'origin/master' into particles
Conflicts:
src/Components/Physics.h
src/GameWorld.cpp
src/World.cpp
src/World.h
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-05-12 13:55:48 +02:00 |
|
|
ViktorLjung
|
d7e5630f1b
|
Tank with 8 wheels
|
2014-05-11 01:52:00 +02:00 |
|
|
Jace
|
b6372d44b8
|
Merge branch 'master' into gui
|
2014-05-11 01:46:12 +02:00 |
|
|
Jace
|
41177581c6
|
WIP Render Queue
|
2014-05-11 01:46:02 +02:00 |
|
|
Tleety
|
d9ca9ac1f7
|
Removed unused code.
|
2014-05-11 01:09:06 +02:00 |
|
|
Tleety
|
37a8af6b65
|
Added being able to change attenuation in real time
|
2014-05-11 01:05:22 +02:00 |
|
|
Tleety
|
22d855a521
|
Fixed attenuation for lights.
|
2014-05-11 00:02:34 +02:00 |
|
|
Tleety
|
c1c30b0019
|
Fixed lights and added a bad gamma correction
|
2014-05-10 19:51:48 +02:00 |
|
|
Jace
|
d00ff3c2ed
|
Assets now as Git submodule!
(cherry picked from commit 6e6a115ac3)
|
2014-05-10 19:44:29 +02:00 |
|
|
Jace
|
4c0b465c7f
|
Assets now as Git submodule!
(cherry picked from commit 6e6a115ac3)
|
2014-05-10 19:39:29 +02:00 |
|
|
Jace
|
6e6a115ac3
|
Assets now as Git submodule!
|
2014-05-10 19:21:46 +02:00 |
|
|
Tleety
|
6e3ba0f077
|
Merge remote-tracking branch 'origin/master' into deffered_rendering
|
2014-05-10 17:45:01 +02:00 |
|