 tleety
|
376ff34694
|
Merged into master and uncommented ball
|
2015-09-15 14:59:48 +02:00 |
|
|
tleety
|
eeca9ed50a
|
Merge branch 'GLrenderer'
|
2015-09-15 14:54:45 +02:00 |
|
 PlatinumSkink
|
c6c3602aae
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-09-15 14:36:41 +02:00 |
|
|
PlatinumSkink
|
d3d24876bb
|
Something.
|
2015-09-15 14:32:42 +02:00 |
|
 Jace
|
b58cdc813d
|
Revert "impulse list and velocity for physics"
This reverts commit 2d7b32b7a3.
|
2015-09-15 14:31:10 +02:00 |
|
|
PlatinumSkink
|
ce878ac1db
|
Lives kind of work, and so does the demo!
|
2015-09-15 13:35:04 +02:00 |
|
|
tleety
|
c5bbcec5dc
|
Transparancy now working for forward rendering
|
2015-09-15 13:20:01 +02:00 |
|
|
PlatinumSkink
|
9db15aa898
|
This is a safety commit on a working point because what I do next might crash everything.
|
2015-09-15 12:41:57 +02:00 |
|
|
PlatinumSkink
|
88bd96861d
|
Tried to implement lives. Failed. Everything crashes if I try to RemoveEntity in Update.
|
2015-09-15 12:40:23 +02:00 |
|
 Stiffly
|
ff00e2bf9c
|
nothing works
|
2015-09-14 17:07:25 +02:00 |
|
 viktorljung
|
2d7b32b7a3
|
impulse list and velocity for physics
|
2015-09-14 16:06:48 +01:00 |
|
|
tleety
|
b9eda67a2a
|
Added depth buffer to fix transparency, still a bug that transparency goes wrong at when you press a button.
|
2015-09-14 16:53:14 +02:00 |
|
|
viktorljung
|
dfef1ec774
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
include/Core/Engine.h
src/game/Physics/PhysicsSystem.cpp
|
2015-09-14 15:37:38 +01:00 |
|
|
viktorljung
|
c7704f62e9
|
fixed timestep working
|
2015-09-14 14:59:39 +01:00 |
|
|
PlatinumSkink
|
157fa36f68
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-09-14 15:41:04 +02:00 |
|
|
PlatinumSkink
|
8d1ad184a6
|
Modified the pad-and-ball collision code a bit. Hopefully for the better.
|
2015-09-14 15:39:39 +02:00 |
|
|
Stiffly
|
760574f454
|
Merge remote-tracking branch 'origin/master' into Sound
Conflicts:
include/Core/Engine.h
src/game/CMakeLists.txt
|
2015-09-14 14:54:41 +02:00 |
|
|
Stiffly
|
ed5881ec54
|
Linking OpenAL.
|
2015-09-14 14:45:44 +02:00 |
|
|
PlatinumSkink
|
1b9da2de1b
|
Put back the out-commented line that broke it all.
|
2015-09-14 14:38:18 +02:00 |
|
|
tleety
|
7b984c7cc3
|
Merge into master
|
2015-09-11 15:17:49 +02:00 |
|
|
tleety
|
748f61883b
|
Added some textures and fixed camera perspective
|
2015-09-11 15:07:48 +02:00 |
|
|
PlatinumSkink
|
bda864ac11
|
Breakout Standard Screen
Meaning bricks, ball, pad, walls bounces, things.
May or may not work as intended.
|
2015-09-11 15:07:00 +02:00 |
|
|
viktorljung
|
586f8d438c
|
changed box size/scale
|
2015-09-11 11:04:22 +01:00 |
|
|
viktorljung
|
6932a22d7a
|
Rotation right this time
|
2015-09-11 10:48:15 +01:00 |
|
|
tleety
|
9382acdb52
|
Added a few brick textures
|
2015-09-11 11:16:43 +02:00 |
|
|
PlatinumSkink
|
ead7c6c754
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-09-11 10:51:52 +02:00 |
|
|
PlatinumSkink
|
c829315598
|
Ball hitting bricks destroys bricks! We can PLAY! (kind of)
|
2015-09-11 10:50:49 +02:00 |
|
|
viktorljung
|
d0549403ab
|
Probably removes bodies safely
|
2015-09-10 23:10:25 +01:00 |
|
|
PlatinumSkink
|
7e945c85d3
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-09-10 23:52:07 +02:00 |
|
|
tleety
|
c4c1158364
|
Working lights and deferred rendering
|
2015-09-10 23:48:45 +02:00 |
|
|
viktorljung
|
068028c005
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
|
2015-09-10 22:44:36 +01:00 |
|
|
viktorljung
|
71cdd1f795
|
SetImpulse event
|
2015-09-10 22:43:25 +01:00 |
|
|
viktorljung
|
32d7693662
|
Merge remote-tracking branch 'origin/master' into Physics
|
2015-09-10 22:24:43 +01:00 |
|
|
viktorljung
|
963e492f9c
|
CircleShape
|
2015-09-10 22:24:19 +01:00 |
|
|
PlatinumSkink
|
62d9ba1422
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-09-10 22:57:20 +02:00 |
|
|
PlatinumSkink
|
e0bc28092a
|
Adjusted size to new scale.
|
2015-09-10 22:56:23 +02:00 |
|
|
PlatinumSkink
|
9867327f7f
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
Conflicts:
include/Core/Engine.h
|
2015-09-10 22:44:44 +02:00 |
|
|
PlatinumSkink
|
3e04ff2e34
|
Gusp.
|
2015-09-10 22:40:18 +02:00 |
|
|
tleety
|
8065f6d389
|
Merge remote-tracking branch 'origin/master' into GLrenderer
|
2015-09-10 22:39:23 +02:00 |
|
|
tleety
|
f97112bb20
|
Backbone to deferred rendering started
|
2015-09-10 22:39:03 +02:00 |
|
|
Jace
|
c3f3df3d9f
|
Fixed unit quad with texture coordinates
|
2015-09-10 22:38:44 +02:00 |
|
|
PlatinumSkink
|
4890b74f37
|
Random Commit to get Viktor's stuff
|
2015-09-10 22:32:09 +02:00 |
|
|
viktorljung
|
4853c67520
|
Merge branch 'Physics'
|
2015-09-10 21:28:39 +01:00 |
|
|
viktorljung
|
d77146de11
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
|
2015-09-10 21:27:39 +01:00 |
|
|
viktorljung
|
9bf0ca0e46
|
ContactListener and contact events
|
2015-09-10 21:25:34 +01:00 |
|
|
tleety
|
9a381e84af
|
Merge remote-tracking branch 'origin/master' into GLrenderer
# Conflicts:
# include/Core/Engine.h
|
2015-09-10 22:16:15 +02:00 |
|
|
tleety
|
c0589563af
|
Base lightrendering started, still some work to be done.
|
2015-09-10 22:13:37 +02:00 |
|
|
Jace
|
5bd9ab3320
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
|
2015-09-10 22:09:53 +02:00 |
|
|
Jace
|
de0b960353
|
Added unit quad to core assets
|
2015-09-10 22:09:42 +02:00 |
|
|
PlatinumSkink
|
1d94338214
|
Added CBall
|
2015-09-10 21:46:03 +02:00 |
|