 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 |
|
|
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 |
|
|
Tleety
|
1268b3d8fd
|
Removed Unused code in renderer
|
2014-05-10 17:44:55 +02:00 |
|
|
Jace
|
62ca923821
|
Defucked defucked rendering
|
2014-05-07 22:34:38 +02:00 |
|
|
ViktorLjung
|
5393113dee
|
Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok
Conflicts:
src/GameWorld.cpp
|
2014-05-07 22:33:35 +02:00 |
|
|
ViktorLjung
|
ea69a9345d
|
PhysicsSystem redesigned, more work is needed.
|
2014-05-07 22:29:03 +02:00 |
|
|
Stiffly
|
1a365bf069
|
Billboarding on sprites
|
2014-05-07 21:34:19 +02:00 |
|
|
Tleety
|
b1b60bce61
|
WIP
|
2014-05-07 14:23:01 +00:00 |
|
|
Jace
|
7c18d0c778
|
Merge branch 'master' into gui
|
2014-05-06 18:08:32 +02:00 |
|
|
Jace
|
c73da364f4
|
Derpy skybox un-derped
|
2014-05-06 18:08:13 +02:00 |
|
|
Jace
|
0e2a373053
|
Merge remote-tracking branch 'origin/master' into gui
Conflicts:
src/GameWorld.cpp
src/Systems/FreeSteeringSystem.cpp
src/Systems/PhysicsSystem.cpp
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-05-06 18:05:31 +02:00 |
|
|
Jace
|
a232559bb1
|
FreeSteeringSystem converted to take input commands
|
2014-05-06 17:07:38 +02:00 |
|
|
Jace
|
8c8edd0e8e
|
WIP InputController for easier command handling in systems
|
2014-05-06 14:33:02 +02:00 |
|
|
Stiffly
|
398b157b89
|
Rendering sprites
|
2014-05-06 13:52:34 +02:00 |
|
|
Jace
|
469b53c14d
|
Updated model paths
|
2014-05-06 04:46:22 +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
|
330a212830
|
Rectangle comparison fixed
|
2014-05-05 07:15:47 +02:00 |
|
|
Stiffly
|
262d259681
|
Orientation interpolation complete (v.length() != glm::length(v), the latter is correct)
|
2014-05-01 02:00:10 +02:00 |
|
|
Stiffly
|
fa9a610353
|
Almost correct Orientation calculation...
|
2014-04-29 14:21:52 +02:00 |
|
|
ViktorLjung
|
dc32316bd7
|
Fixing suspension and car collision shape
|
2014-04-29 14:21:14 +02:00 |
|
|
Jace
|
9e8c3161e0
|
WIP Frame
|
2014-04-29 13:58:37 +02:00 |
|
|
Jace
|
d0211ef8d6
|
Encapsulated Renderer WIDTH and HEIGHT variables.
|
2014-04-29 13:58:27 +02:00 |
|