Commit Graph

Select branches

Hide Pull Requests

FMOD

Sound+Particles

deferred_rendering_normal_maps

deffered_rendering

demo3

events

gui

gwen

havok

master

particles

prototype

render_queue

vehicle-helicopter

vehicle_selection

demo

demo2

Mono Color

• 6137adf604 Rockets deleted properly ViktorLjung 2014-05-21 18:30:16 +02:00
• ecbcee0fbf Deleted fmodex.dll file from incorrect path Stiffly 2014-05-21 17:45:19 +02:00
• fe6e21a2d1 FMOD library only linked for release configuration Stiffly 2014-05-21 17:43:55 +02:00
• 462af02a6b Added logic for 3D sound Stiffly 2014-05-21 17:14:07 +02:00
• dbad1ee7f5 Work done on light and shadows. Tleety 2014-05-21 16:51:05 +02:00
• 6d3aa5d394 Red rocket demo3 Jace 2014-05-20 04:34:44 +02:00
• 7e5cf8efaa Fuckhack ViktorLjung 2014-05-20 03:41:10 +02:00
• fe400e9af8 Merge remote-tracking branch 'origin/particles' ViktorLjung 2014-05-20 03:40:44 +02:00
• e414087816 Some work done on lights and normals and other buggs/fixes Tleety 2014-05-20 03:33:42 +02:00
• 609687d6b4 MULTIPLAYER ViktorLjung 2014-05-20 00:20:09 +02:00
• 65acae410d Added Explosion function to particles Stiffly 2014-05-20 00:38:30 +02:00
• d06702a7e0 Added Listener component Stiffly 2014-05-19 22:13:52 +02:00
• ff58f881ae Merge branch 'havok' into gui ViktorLjung 2014-05-19 22:06:04 +02:00
• ec74d700be fix ViktorLjung 2014-05-19 21:57:13 +02:00
• 40718407ac Merge remote-tracking branch 'origin/master' into gui Jace 2014-05-19 21:51:25 +02:00
• 82d5953c97 Specular maps working. Tleety 2014-05-19 21:36:28 +02:00
• 7f77db97a0 Convert functions working in debug ViktorLjung 2014-05-19 19:59:17 +02:00
• bd7ba73bca Split screen working Jace 2014-05-19 17:20:43 +02:00
• e07a0a2b1a More viewport stuff Jace 2014-05-19 04:29:30 +02:00
• 3023391358 Merge remote-tracking branch 'origin/deffered_rendering' into gui Jace 2014-05-19 03:15:21 +02:00
• 7455f4b865 NormalMaps Working and started work on specular maps. Tleety 2014-05-19 01:01:46 +02:00
• 998ee3cfab Brakes working ViktorLjung 2014-05-19 00:58:48 +02:00
• 539196cd45 Viewport stuff Jace 2014-05-19 00:51:40 +02:00
• 73afc8dad4 added wubs to the game, also FMOD Stiffly 2014-05-19 00:49:57 +02:00
• f14a83caa8 Assets ViktorLjung 2014-05-18 23:59:18 +02:00
• 02243becee Recoil while firing, clamp inputs, merge Helicopter ViktorLjung 2014-05-18 23:54:01 +02:00
• 85e5d7461c Merge remote-tracking branch 'origin/vehicle-helicopter' into havok ViktorLjung 2014-05-18 21:09:08 +02:00
• fd0bb18bd3 tank stuff ViktorLjung 2014-05-18 21:07:03 +02:00
• 1a52b1d04c finlir Stiffly 2014-05-18 20:32:10 +02:00
• a36d6c554a Merge branch 'master' into havok Jace 2014-05-17 21:23:46 +02:00
• a8ecacab11 tank steering ViktorLjung 2014-05-17 18:45:54 +02:00
• 2520fba1b4 Merge remote-tracking branch 'origin/master' into deffered_rendering Tleety 2014-05-17 18:10:48 +02:00
• 4d15d3e02c Collision callbacks ViktorLjung 2014-05-17 18:06:56 +02:00
• 67778f391a Working on shadows Tleety 2014-05-17 14:00:26 +02:00
• 542ad075ea ECS improved to make it less annoying to use Jace 2014-05-17 17:46:17 +02:00
• 16d51c64c5 Meh-ish helicopter physics Jace 2014-05-17 00:56:38 +02:00
• add27aa8f4 Back to working order Jace 2014-05-17 01:21:40 +02:00
• d98badc59a Latest assets Jace 2014-05-17 00:57:24 +02:00
• f180abcd63 Input System improved to allow for multiple inputs for same bind Jace 2014-05-17 00:52:11 +02:00
• 2a28f65c37 FreeSteeringSystem updated to allow for controller input Jace 2014-05-17 00:50:45 +02:00
• 33b14b1859 Mouse locking event Jace 2014-05-17 00:49:23 +02:00
• 44e376e815 Pls go away Jace 2014-05-16 02:13:28 +02:00
• 9723d80742 And then Microsoft happened... Jace 2014-05-15 21:44:33 +02:00
• 6684aa06b7 Merge branch 'master' into gui Jace 2014-05-15 21:16:43 +02:00
• 05757b6112 assets ViktorLjung 2014-05-15 19:30:44 +02:00
• 6dd25357bb FINAL demo2 Jace 2014-05-13 05:13:28 +02:00
• 56ab378eb9 Assets Jace 2014-05-13 05:06:25 +02:00
• 3e7bd21fad Demo stuff Jace 2014-05-13 05:04:09 +02:00
• bafa8d0a5d Merge remote-tracking branch 'origin/deffered_rendering' Jace 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 ViktorLjung 2014-05-13 03:36:09 +02:00
• ce5b62cf6d Shots fired! （ ﾟДﾟ） ViktorLjung 2014-05-13 03:32:58 +02:00
• d259811795 Xbox360 controller support Jace 2014-05-13 00:55:32 +02:00
• 74d3269e35 Merge remote-tracking branch 'origin/particles' into havok ViktorLjung 2014-05-13 01:57:28 +02:00
• df13663ca8 Two emitters and following camera Stiffly 2014-05-13 00:55:42 +02:00
• b9231e4d46 Shots need more work ViktorLjung 2014-05-13 01:50:58 +02:00
• ccd1393dac Fixed some shadow buggs. Tleety 2014-05-12 23:02:19 +02:00
• ad19848c1b WIP ECS GUI Jace 2014-05-12 22:33:59 +02:00
• 38482431a1 Tank tower and barrel steering working ViktorLjung 2014-05-12 22:33:53 +02:00
• 92e9fd1049 fixup! Fixed relative transform rotations (For real this time?) ViktorLjung 2014-05-12 22:24:53 +02:00
• 19a2879104 Emitter childed to a wheel. BUG FIXED: Billboarding calculation. Stiffly 2014-05-12 22:21:27 +02:00
• ddc41b88a7 Fixed relative transform rotations (For real this time?) ViktorLjung 2014-05-12 22:15:21 +02:00
• 5d48ea7e2a not reversed input for Camera... Stiffly 2014-05-12 22:05:56 +02:00
• 4639a6e4c3 Working shadows, however ugly they are. Tleety 2014-05-12 18:03:39 +02:00
• 457ee84903 Merge remote-tracking branch 'origin/havok' into particles Stiffly 2014-05-12 15:43:41 +02:00
• 2aa51c3e90 Tank sterring event-based ViktorLjung 2014-05-12 14:04:55 +02:00
• c8a77d5c3d Merge remote-tracking branch 'origin/master' into havok ViktorLjung 2014-05-12 14:03:02 +02:00
• e0b5b72454 Merge remote-tracking branch 'origin/master' into particles Stiffly 2014-05-12 13:55:48 +02:00
• d7e5630f1b Tank with 8 wheels ViktorLjung 2014-05-11 01:52:00 +02:00
• b6372d44b8 Merge branch 'master' into gui Jace 2014-05-11 01:46:12 +02:00
• 41177581c6 WIP Render Queue Jace 2014-05-11 01:46:02 +02:00
• d9ca9ac1f7 Removed unused code. Tleety 2014-05-11 01:09:06 +02:00
• 37a8af6b65 Added being able to change attenuation in real time Tleety 2014-05-11 01:05:22 +02:00
• 22d855a521 Fixed attenuation for lights. Tleety 2014-05-11 00:02:34 +02:00
• c1c30b0019 Fixed lights and added a bad gamma correction Tleety 2014-05-10 19:51:48 +02:00
• d00ff3c2ed Assets now as Git submodule! Jace 2014-05-10 19:13:41 +02:00
• 4c0b465c7f Assets now as Git submodule! Jace 2014-05-10 19:13:41 +02:00
• 6e6a115ac3 Assets now as Git submodule! Jace 2014-05-10 19:13:41 +02:00
• 6e3ba0f077 Merge remote-tracking branch 'origin/master' into deffered_rendering Tleety 2014-05-10 17:45:01 +02:00
• 1268b3d8fd Removed Unused code in renderer Tleety 2014-05-10 17:44:55 +02:00
• 4494e7592d How NOT to do normal maps deferred_rendering_normal_maps Jace 2014-05-10 16:01:36 +02:00
• 62ca923821 Defucked defucked rendering Jace 2014-05-07 22:34:38 +02:00
• 5393113dee Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok ViktorLjung 2014-05-07 22:33:35 +02:00
• ea69a9345d PhysicsSystem redesigned, more work is needed. ViktorLjung 2014-05-07 16:21:47 +02:00
• 1a365bf069 Billboarding on sprites Stiffly 2014-05-07 21:34:19 +02:00
• b1b60bce61 WIP Tleety 2014-05-07 14:23:01 +00:00
• 7c18d0c778 Merge branch 'master' into gui Jace 2014-05-06 18:08:32 +02:00
• c73da364f4 Derpy skybox un-derped Jace 2014-05-06 18:08:13 +02:00
• 0e2a373053 Merge remote-tracking branch 'origin/master' into gui Jace 2014-05-06 18:05:31 +02:00
• a232559bb1 FreeSteeringSystem converted to take input commands Jace 2014-05-06 17:07:38 +02:00
• 8c8edd0e8e WIP InputController for easier command handling in systems Jace 2014-05-06 14:33:02 +02:00
• 398b157b89 Rendering sprites Stiffly 2014-05-06 13:52:34 +02:00
• 469b53c14d Updated model paths Jace 2014-05-06 04:46:22 +02:00
• 0e068be77b Basic input binding and command publishing system Jace 2014-05-05 09:17:58 +02:00
• 5e7537b903 Input events moved from InputSystem to new InputManager Jace 2014-05-05 07:16:45 +02:00
• 330a212830 Rectangle comparison fixed Jace 2014-05-05 07:15:47 +02:00
• 262d259681 Orientation interpolation complete (v.length() != glm::length(v), the latter is correct) Stiffly 2014-05-01 02:00:10 +02:00
• fa9a610353 Almost correct Orientation calculation... Stiffly 2014-04-29 14:21:52 +02:00
• dc32316bd7 Fixing suspension and car collision shape ViktorLjung 2014-04-29 14:21:14 +02:00
• 9e8c3161e0 WIP Frame Jace 2014-04-29 13:58:37 +02:00
• d0211ef8d6 Encapsulated Renderer WIDTH and HEIGHT variables. Jace 2014-04-29 13:58:27 +02:00