 Tleety
|
3f6933da76
|
tower destroy debris
|
2014-06-05 06:13:51 +02:00 |
|
|
Tleety
|
8f1f87512f
|
Merge remote-tracking branch 'origin/Sound+Particles'
|
2014-06-05 05:22:33 +02:00 |
|
|
Tleety
|
c7a37e1b9b
|
Merge remote-tracking branch 'origin/master' into deffered_rendering
|
2014-06-05 05:21:28 +02:00 |
|
|
Tleety
|
85d5f209a3
|
Merge branch 'deffered_rendering' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into deffered_rendering
|
2014-06-05 05:21:09 +02:00 |
|
|
Tleety
|
fd92f37902
|
Skybox working, flag for averaging normals working.
|
2014-06-05 05:20:51 +02:00 |
|
 Stiffly
|
16e4129d70
|
Merge remote-tracking branch 'origin/master' into Sound+Particles
Conflicts:
src/Components/Vehicle.h
src/Systems/TankSteeringSystem.cpp
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-06-05 05:16:57 +02:00 |
|
|
Stiffly
|
ccc2c49317
|
Vehicle component has "CurrentRPM"
|
2014-06-05 05:11:04 +02:00 |
|
 Jace
|
9ed2f04036
|
Fixed particles not rendering to both viewports
|
2014-06-05 04:50:06 +02:00 |
|
|
Jace
|
866c65514d
|
Decorations!
|
2014-06-05 03:54:41 +02:00 |
|
|
Stiffly
|
09971b2d77
|
Publishes some bgm sounds
|
2014-06-05 03:14:45 +02:00 |
|
|
Tleety
|
a6941c0fb6
|
Merge remote-tracking branch 'origin/master' into deffered_rendering
Conflicts:
src/GameWorld.cpp
src/GameWorld.h
vs11/Returngeance/Returngeance.vcxproj
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-06-05 03:03:00 +02:00 |
|
|
Tleety
|
ccb3d6d84f
|
Turret able to shoot, no collision event yet.
|
2014-06-05 02:54:44 +02:00 |
|
|
Tleety
|
93c4805a22
|
Tower not aiming towards the player.
|
2014-06-05 00:35:15 +02:00 |
|
|
Jace
|
56e6545f0f
|
Direct damage and VulnerableToSplash flag on Health component
|
2014-06-04 23:54:52 +02:00 |
|
|
Jace
|
2d716e2998
|
Merge branch 'master' into havok
Conflicts:
src/GameWorld.cpp
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-06-04 22:01:25 +02:00 |
|
|
Stiffly
|
76a9081d4b
|
Merge remote-tracking branch 'origin/master' into Sound+Particles
Conflicts:
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-06-04 18:22:16 +02:00 |
|
|
Stiffly
|
6e9eeaf991
|
Dust particles from tank wheels.
|
2014-06-04 18:15:47 +02:00 |
|
 ViktorLjung
|
1b20204897
|
Player/Team specific triggers
|
2014-06-04 18:12:58 +02:00 |
|
|
Jace
|
bf5106e5b6
|
Merge remote-tracking branch 'origin/deffered_rendering'
|
2014-06-04 17:14:34 +02:00 |
|
|
Jace
|
8b2fc86159
|
Main menu hidden for your debugging pleasure
|
2014-06-04 17:06:08 +02:00 |
|
|
Jace
|
5f1feffe0d
|
Main menu finished
|
2014-06-04 16:59:30 +02:00 |
|
|
ViktorLjung
|
c06c436cd1
|
Merge remote-tracking branch 'origin/master' into havok
|
2014-06-04 15:43:51 +02:00 |
|
|
ViktorLjung
|
70960c9eba
|
Jeep working
|
2014-06-04 15:43:20 +02:00 |
|
|
Stiffly
|
f2ae46efa5
|
Merge remote-tracking branch 'origin/master' into Sound+Particles
|
2014-06-04 15:22:00 +02:00 |
|
|
Stiffly
|
2ef5d49f7e
|
Added Destructor. (improved StopSound and PlayBGM events)
|
2014-06-04 15:21:05 +02:00 |
|
|
Tleety
|
6cae09c5d8
|
Walls are now destroyable
|
2014-06-04 14:48:40 +02:00 |
|
|
Jace
|
7b90e54899
|
Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance
|
2014-06-04 13:40:23 +02:00 |
|
|
Jace
|
d3f8ef2d9c
|
Wallz
|
2014-06-04 06:20:22 +02:00 |
|
|
Stiffly
|
f9426745f7
|
Merge remote-tracking branch 'origin/master' into Sound+Particles
Conflicts:
assets
|
2014-06-04 06:17:05 +02:00 |
|
|
Stiffly
|
5e78fdc930
|
Not deleting in a "foreach"-loop
|
2014-06-04 06:09:59 +02:00 |
|
|
Tleety
|
5a6ae2a24e
|
Merge remote-tracking branch 'origin/master' into deffered_rendering
Conflicts:
assets
src/GameWorld.cpp
|
2014-06-04 06:02:21 +02:00 |
|
|
Tleety
|
d5dcb0b72c
|
Fixed normals nor averaging when at a corner.
|
2014-06-04 05:56:38 +02:00 |
|
|
ViktorLjung
|
94178098ea
|
Merge remote-tracking branch 'origin/master' into havok
Conflicts:
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-06-04 05:48:48 +02:00 |
|
|
Jace
|
62dd85349f
|
A gate and better bridges.
|
2014-06-04 05:47:29 +02:00 |
|
|
ViktorLjung
|
f9f20535ba
|
Jeep and tank tuning
|
2014-06-04 05:47:17 +02:00 |
|
|
Tleety
|
74b86bc6d4
|
Lights working without much visable bugs.
|
2014-06-04 05:44:12 +02:00 |
|
|
Stiffly
|
27b735325a
|
Improved splashes
|
2014-06-04 05:31:05 +02:00 |
|
|
Stiffly
|
e39e1eda89
|
Merge remote-tracking branch 'origin/master' into Sound+Particles
Conflicts:
src/GameWorld.cpp
|
2014-06-04 05:30:42 +02:00 |
|
|
Jace
|
3c17ab6037
|
Bridges
|
2014-06-04 05:12:06 +02:00 |
|
|
Stiffly
|
7f017bfaed
|
Tanks now have listeners.
|
2014-06-04 04:40:16 +02:00 |
|
|
Jace
|
9813e9a058
|
Merge remote-tracking branch 'origin/Sound+Particles'
Conflicts:
src/GameWorld.cpp
|
2014-06-04 04:24:10 +02:00 |
|
|
Tleety
|
cf2040f038
|
Inget funkar, broken commit, dont use.
|
2014-06-04 04:20:15 +02:00 |
|
|
Jace
|
e11f656b3d
|
Fixed physics relative orientations!
|
2014-06-04 04:18:44 +02:00 |
|
|
Stiffly
|
72a8ee9080
|
Water splash
|
2014-06-04 03:26:29 +02:00 |
|
|
Jace
|
7d9f1a7ac7
|
Merge remote-tracking branch 'origin/havok'
|
2014-06-04 02:36:59 +02:00 |
|
|
Stiffly
|
90a92d05e4
|
Merge remote-tracking branch 'origin/master' into Sound+Particles
Conflicts:
src/GameWorld.cpp
|
2014-06-04 01:27:15 +02:00 |
|
|
Stiffly
|
9f1d5206bd
|
Muzzle Flash
|
2014-06-04 01:23:15 +02:00 |
|
|
Jace
|
397188b855
|
Fixed frame scissor test
|
2014-06-04 00:46:03 +02:00 |
|
|
ViktorLjung
|
ac855f554b
|
Fixed local physics orientation
|
2014-06-04 00:45:43 +02:00 |
|
|
Stiffly
|
909ee94e26
|
Billboarding working again
|
2014-06-03 23:48:13 +02:00 |
|