 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
|
57d29d0db7
|
Started implementation of events for InputSystem and SoundSystem
|
2014-04-28 19:55:31 +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 |
|
 ViktorLjung
|
8facd9dc9a
|
Rigidbody physics fixed.
|
2014-04-24 23:10:59 +02:00 |
|
|
ViktorLjung
|
6ccb196b3b
|
Jeep physics
|
2014-04-24 01:20:13 +02:00 |
|
|
ViktorLjung
|
afbe58e4f3
|
Wheels now turning and spinning properly.
|
2014-04-24 00:11:49 +02:00 |
|
|
ViktorLjung
|
eb6cc266a3
|
Vehicle component based, wheel rotation and position not working.
|
2014-04-22 19:14:35 +02:00 |
|
|
Jace
|
d2f3adb07e
|
Vehicle keyboard steering!
Steering: Direction keys
Handbrake: Right control
|
2014-04-22 01:46:29 +02:00 |
|
|
ViktorLjung
|
aa64b7074c
|
Vehicle working, ready for entity-component implementation.
|
2014-04-17 00:47:53 +02:00 |
|
 Tleety
|
b1edefcf26
|
La till lite ljus och annan skit. Började på defucked rendering och det gick ju jävligt bra fucktiskt.
|
2014-04-17 00:05:19 +02:00 |
|
|
ViktorLjung
|
0338a06836
|
Fixed timestep.
|
2014-04-16 14:38:26 +02:00 |
|
|
ViktorLjung
|
069d079594
|
Car physics not working, yet!
|
2014-04-16 01:33:05 +02:00 |
|
|
Jace
|
62abb3f964
|
Merge branch 'havok'
Conflicts:
src/GameWorld.cpp
src/Systems/PhysicsSystem.cpp
src/Systems/RenderSystem.cpp
src/Systems/RenderSystem.h
vs11/Returngeance/Returngeance.vcxproj
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-04-16 00:38:30 +02:00 |
|
|
Jace
|
062242ab8e
|
Refactored existing systems to register their own components and resource types.
|
2014-04-13 17:15:46 +02:00 |
|
|
ViktorLjung
|
84484b3703
|
Box and Sphere Rigidbodies working
|
2014-04-13 02:20:50 +02:00 |
|
|
ViktorLjung
|
f6090679b7
|
Havok includes and libs working, ready for implementation.
|
2014-04-12 23:53:14 +02:00 |
|
|
ViktorLjung
|
41db395f61
|
Still trying to get it working.
|
2014-04-12 20:53:35 +02:00 |
|
|
ViktorLjung
|
04fff4a27b
|
Changed toolset to vs11, for future Havok implementation.
|
2014-04-12 01:59:55 +02:00 |
|
|
Jace
|
3470a80f40
|
Revert "Indentation style changed to Horstmann"
This reverts commit f2259f712d.
Conflicts:
src/GameWorld.cpp
src/Systems/PhysicsSystem.cpp
|
2014-04-12 01:48:15 +02:00 |
|
|
ViktorLjung
|
d7e65ff118
|
Vehicle kind of working.
|
2014-04-12 00:36:37 +02:00 |
|
|
Jace
|
f2259f712d
|
Indentation style changed to Horstmann
|
2014-04-11 21:53:05 +02:00 |
|
|
Jace
|
4c081d0e1c
|
Indentation style changed to Allman
Using Artistic Style (http://astyle.sourceforge.net/)
Options:
--style=allman
--indent=tab
--keep-one-line-blocks
--align-pointer=type
--align-reference=name
|
2014-04-11 20:59:42 +02:00 |
|
|
Jace
|
28c7ab4b3e
|
WIP Collision meshes
|
2014-04-07 23:36:06 +02:00 |
|
|
ViktorLjung
|
4a6f0cad32
|
Constraints working, I think... :D
|
2014-04-07 00:09:09 +02:00 |
|
|
ViktorLjung
|
a880e7f3e6
|
CompoundShape works, i.e parent child physics :)
Center of mass is still bugged.
|
2014-04-06 19:00:58 +02:00 |
|
|
ViktorLjung
|
1d0747076f
|
Physics!!!!!1111oneoneonetwo
|
2014-04-06 03:39:50 +02:00 |
|