 tleety
|
1e70e151ee
|
Continued work on water, can now get 1 particle? maybe? Gotta get rendering to work so i can test it.
|
2015-09-21 16:00:20 +02:00 |
|
 PlatinumSkink
|
460c7042bf
|
MultiBalls appear depending on pad's position
|
2015-09-21 13:25:20 +02:00 |
|
|
PlatinumSkink
|
761631c4a6
|
m-button is MultiBall powerup. Still needs fine-tuning.
|
2015-09-17 18:09:22 +02:00 |
|
|
tleety
|
b32934dba6
|
Merge remote-tracking branch 'origin/physics' into water
# Conflicts:
# include/Core/Engine.h
# include/Physics/PhysicsSystem.h
# src/game/Game/PadSystem.cpp
# src/game/Physics/PhysicsSystem.cpp
|
2015-09-17 17:37:58 +02:00 |
|
 viktorljung
|
8ca01ae9c7
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
include/Core/Engine.h
src/game/Game/PadSystem.cpp
src/game/Physics/PhysicsSystem.cpp
|
2015-09-17 17:11:37 +02:00 |
|
|
viktorljung
|
442554812d
|
Collisions kind of working
|
2015-09-17 14:11:09 +01:00 |
|
|
PlatinumSkink
|
bdba34e8e1
|
Reset ball is also octopus.
|
2015-09-16 16:35:41 +02:00 |
|
|
PlatinumSkink
|
30ee6c2430
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-09-16 16:29:57 +02:00 |
|
|
tleety
|
c311408346
|
Ball size fix
|
2015-09-16 16:23:59 +02:00 |
|
|
tleety
|
12273f66af
|
Ball size fix
|
2015-09-16 16:17:02 +02:00 |
|
|
tleety
|
825f6dc991
|
Models now get a standard normal and specular map if they dont have one
|
2015-09-16 16:09:20 +02:00 |
|
|
tleety
|
20fc1232d6
|
Merge remote-tracking branch 'origin/master' into GLrenderer
|
2015-09-16 14:42:38 +02:00 |
|
|
PlatinumSkink
|
5ee5400a28
|
StyleGuide Fix
|
2015-09-15 18:48:26 +02:00 |
|
|
tleety
|
ef9f6a296b
|
Renderer working and some test blocks in the world
|
2015-09-15 17:38:16 +02:00 |
|
|
PlatinumSkink
|
c2d29b6110
|
Added ScoreEvent, added score to bricks. Stage resets after all bricks are destroyed.
|
2015-09-15 17:31:22 +02:00 |
|
|
tleety
|
f19f7bf56a
|
Added a few models and removed ortho camera perspectiv.
|
2015-09-15 17:05:47 +02:00 |
|
|
viktorljung
|
8963e94cd6
|
pad moving with physics velocity
|
2015-09-15 14:27:35 +01:00 |
|
|
PlatinumSkink
|
b340cf97bb
|
I forgot to stage in my last commit.
|
2015-09-15 15:00:47 +02:00 |
|
|
PlatinumSkink
|
d3d24876bb
|
Something.
|
2015-09-15 14:32:42 +02:00 |
|
|
PlatinumSkink
|
ce878ac1db
|
Lives kind of work, and so does the demo!
|
2015-09-15 13:35:04 +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 |
|
|
PlatinumSkink
|
8d1ad184a6
|
Modified the pad-and-ball collision code a bit. Hopefully for the better.
|
2015-09-14 15:39:39 +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 |
|
|
PlatinumSkink
|
c829315598
|
Ball hitting bricks destroys bricks! We can PLAY! (kind of)
|
2015-09-11 10:50:49 +02:00 |
|
|
PlatinumSkink
|
e0bc28092a
|
Adjusted size to new scale.
|
2015-09-10 22:56:23 +02:00 |
|
|
PlatinumSkink
|
4890b74f37
|
Random Commit to get Viktor's stuff
|
2015-09-10 22:32:09 +02:00 |
|
|
PlatinumSkink
|
16c5d2a40f
|
Made a Stage! Imported PlaceHolder Graphics!
|
2015-09-10 21:06:21 +02:00 |
|
|
PlatinumSkink
|
6a81751e56
|
WIP Level System + Pad
|
2015-09-10 20:28:48 +02:00 |
|
|
PlatinumSkink
|
84577cb2c8
|
Created CPad and PadSystem. Doesn't do very much.
|
2015-09-10 16:40:49 +02:00 |
|