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
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
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
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
ea69a9345d
PhysicsSystem redesigned, more work is needed.
2014-05-07 22:29:03 +02: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
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
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
f471d7732f
Vehicle tuning
2014-04-29 03:47:09 +02:00
Jace
57d29d0db7
Started implementation of events for InputSystem and SoundSystem
2014-04-28 19:55:31 +02:00
ed1df6dc60
Proper rotation of child physics objects
2014-04-28 19:51:13 +02:00
Jace
6ba50c2d1e
Fixed GetComponent bug which would create invalid components if the entity didn't have the requested component
2014-04-28 16:16:03 +02:00
Jace
5870a4d7bf
Working event system!
2014-04-28 09:28:18 +02:00
Jace
22138a36aa
MessageRelay renamed to EventRelay
2014-04-28 06:03:45 +02:00
Jace
55059c05fe
Debugging Optimizations
...
Removed Basic Runtime Checks flag /RTC1
Added Maximize Speed flag /O2
Changed Debug Information Format flag /ZI -> /Zi
Added Enable Intrinsic Functions flag /Oi
2014-04-28 04:56:37 +02:00
Jace
7e32946173
Optimizations
2014-04-28 04:00:53 +02:00
00d27f0058
Physics now running on multiple threads
2014-04-28 02:06:08 +02:00
5f3b03fa6d
Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok
...
Conflicts:
src/GameWorld.cpp
src/Systems/PhysicsSystem.cpp
vs11/Returngeance/Returngeance.vcxproj.filters
2014-04-27 08:13:57 +02:00
720cf3aa87
Added support for HkpExtendedMeshShape.
2014-04-27 08:08:00 +02:00
cb6b0a58d8
Resource manager OBJ vs Model conflict fixed
2014-04-27 08:07:18 +02:00
Jace
f02954a62c
Box and Sphere components renamed to BoxShape and SphereShape
2014-04-25 01:05:53 +02:00
Jace
7da030d8cd
Bloody .orig files!
2014-04-25 00:23:49 +02:00
c4e127b154
Added VehicleSetup to Physics filter.
2014-04-24 23:30:46 +02:00
be90953f22
Rigidbody position not updating in debug FIXED
2014-04-24 23:29:28 +02:00
Jace
0567aab8c6
Merge branch 'havok'
2014-04-24 23:12:41 +02:00
Jace
0b7c383e8a
Merge branch 'havok'
...
Conflicts:
src/GameWorld.cpp
src/Systems/PhysicsSystem.cpp
src/Systems/PhysicsSystem.h
vs11/Returngeance/Returngeance.vcxproj.filters
2014-04-24 23:11:16 +02:00
8facd9dc9a
Rigidbody physics fixed.
2014-04-24 23:10:59 +02:00
824b31ff6b
FreeSteering fixed
2014-04-24 20:09:46 +02:00
613610d5b1
Fixed camera view matrix.
2014-04-24 19:49:14 +02:00
Jace
0fbce570ff
Extended Model to support specular and normal maps
2014-04-24 02:36:31 +02:00
6ccb196b3b
Jeep physics
2014-04-24 01:20:13 +02:00
afbe58e4f3
Wheels now turning and spinning properly.
2014-04-24 00:11:49 +02:00
c1cb4da684
Fixed quaternion relative rotations!
2014-04-24 00:03:22 +02:00
e95d78aba6
Fixed quaternion relative rotations!
2014-04-24 00:02:06 +02:00
Jace
3412fa42f7
Jeep entity setup.
2014-04-23 23:25:41 +02:00
Jace
de1290bf67
Added a few debug messages to ResourceManager.
...
No longer warns about hot-loading when a resource which causes a load chain is preloaded.
2014-04-23 17:58:11 +02:00
Jace
530b16e31b
Extended OBJ loader to parse specular and normal maps
2014-04-23 17:56:04 +02:00
Jace
dfd9425473
WIP Frame
2014-04-23 02:19:17 +02:00
ViktorLjung
Jace