Jace
44e376e815
Pls go away
2014-05-16 02:13:28 +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
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
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
ce5b62cf6d
Shots fired! （ ﾟДﾟ）
2014-05-13 03:32:58 +02:00
Jace
d259811795
Xbox360 controller support
2014-05-13 02:24:42 +02:00
74d3269e35
Merge remote-tracking branch 'origin/particles' into havok
...
Conflicts:
src/Components/Vehicle.h
2014-05-13 01:57:28 +02:00
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
38482431a1
Tank tower and barrel steering working
2014-05-12 22:33:53 +02:00
19a2879104
Emitter childed to a wheel. BUG FIXED: Billboarding calculation.
2014-05-12 22:21:27 +02:00
457ee84903
Merge remote-tracking branch 'origin/havok' into particles
...
Conflicts:
src/Components/Vehicle.h
2014-05-12 15:43:41 +02:00
2aa51c3e90
Tank sterring event-based
2014-05-12 14:04:55 +02:00
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
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
d7e5630f1b
Tank with 8 wheels
2014-05-11 01:52:00 +02:00
Jace
41177581c6
WIP Render Queue
2014-05-11 01:46:02 +02:00
Jace
62ca923821
Defucked defucked rendering
2014-05-07 22:34:38 +02:00
ea69a9345d
PhysicsSystem redesigned, more work is needed.
2014-05-07 22:29:03 +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
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
dc32316bd7
Fixing suspension and car collision shape
2014-04-29 14:21:14 +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
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
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
Jace
04cafc53e2
Implemented entity cloning
2014-04-27 07:48:16 +02:00
a199e777bc
Working Debug mode
2014-04-27 03:59:41 +02:00
90e929131f
Merge remote-tracking branch 'origin/master' into deffered_rendering
...
Conflicts:
src/GameWorld.cpp
src/Shaders/Fragment.glsl
vs11/Returngeance/Returngeance.vcxproj.filters
2014-04-27 02:51:04 +02:00
87cac66cd8
Basic working deferred rendering
2014-04-27 02:44:04 +02:00
Jace
f02954a62c
Box and Sphere components renamed to BoxShape and SphereShape
2014-04-25 01:05:53 +02:00
c4e127b154
Added VehicleSetup to Physics filter.
2014-04-24 23:30:46 +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
6d75336496
Started on deferred rendering framework.
2014-04-24 00:11:16 +02:00
Jace
ee34b15cf1
Rectangle class.
2014-04-23 01:36:03 +02:00
Jace
1e2f7fdd5c
Skeleton MessageRelay
2014-04-22 19:15:02 +02:00
4481c95681
VehicleSetup componentbased.
2014-04-22 17:14:29 +02:00
55221cca12
Implemented Spawn and Remove function for particles. Also added a Particle component.
2014-04-22 16:52:14 +02:00
5e402af093
Added ParticleSystem skeleton plus basic temporary implementation.
2014-04-17 00:08:27 +02:00
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
fe263784ae
Visual studio crap stuff
2014-04-16 14:46:41 +02:00
069d079594
Car physics not working, yet!
2014-04-16 01:33:05 +02:00
Jace
cf6e16222a
Boost and Havok environment variables changed to be version specific
2014-04-16 01:17:37 +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
ViktorLjung
Stiffly
Tleety