072e4d4dbb
OnComponentCreated nu eventbaserat
2014-05-25 04:01:40 +02:00
ad902cb511
Merge remote-tracking branch 'origin/master' into FMOD
...
Conflicts:
src/GameWorld.cpp
src/Systems/SoundSystem.h
vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-25 01:42:26 +02:00
ecbcee0fbf
Deleted fmodex.dll file from incorrect path
2014-05-21 17:45:19 +02:00
fe6e21a2d1
FMOD library only linked for release configuration
2014-05-21 17:43:55 +02:00
609687d6b4
MULTIPLAYER
2014-05-20 01:43:59 +02:00
d06702a7e0
Added Listener component
2014-05-19 22:13:52 +02:00
ff58f881ae
Merge branch 'havok' into gui
...
Conflicts:
vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-19 22:06:04 +02:00
Jace
40718407ac
Merge remote-tracking branch 'origin/master' into gui
...
Conflicts:
src/GameWorld.cpp
src/InputManager.cpp
src/Systems/RenderSystem.cpp
vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-19 21:51:25 +02:00
Jace
539196cd45
Viewport stuff
2014-05-19 00:55:58 +02:00
73afc8dad4
added wubs to the game, also FMOD
2014-05-19 00:49:57 +02:00
02243becee
Recoil while firing, clamp inputs, merge Helicopter
2014-05-18 23:54:01 +02:00
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
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
4d15d3e02c
Collision callbacks
2014-05-17 18:06:56 +02:00
Jace
16d51c64c5
Meh-ish helicopter physics
2014-05-17 03:49:53 +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
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
Stiffly
ViktorLjung
Jace
Tleety