Thomas
|
b6b1bfb649
|
things
|
2022-01-11 15:13:01 +01:00 |
|
Thomas
|
105dd3b518
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/pixelManager/goodPixelManager.cpp
|
2022-01-11 15:04:32 +01:00 |
|
Thomas
|
b4d23c13b0
|
modified drawPlayer
|
2022-01-11 15:02:50 +01:00 |
|
|
|
d422608290
|
b
|
2022-01-11 15:00:25 +01:00 |
|
|
|
cc30d3b3cd
|
a
|
2022-01-11 14:48:23 +01:00 |
|
Thomas
|
f2b7571c7f
|
Merge remote-tracking branch 'origin/master'
|
2022-01-11 14:42:47 +01:00 |
|
Thomas
|
7acfc27bb5
|
method ovveride
|
2022-01-11 14:42:41 +01:00 |
|
|
|
8aea8ba0f9
|
Doc stuff again
|
2022-01-11 14:31:07 +01:00 |
|
Thomas
|
9cd2593f47
|
oops
|
2022-01-11 14:16:07 +01:00 |
|
Thomas
|
a01ea867cb
|
modified documentation
|
2022-01-11 10:17:54 +01:00 |
|
Thomas
|
7919f8f722
|
Merge remote-tracking branch 'origin/master'
|
2022-01-10 17:49:02 +01:00 |
|
Thomas
|
8b25c55cbc
|
Fixed god. Last commit, I'm not going to do more
|
2022-01-10 17:48:56 +01:00 |
|
|
|
e606a641af
|
now we have a little message in the death menu to tell who won
|
2022-01-10 17:03:06 +01:00 |
|
Thomas
|
f671227a8b
|
Merge remote-tracking branch 'origin/master'
|
2022-01-10 16:01:38 +01:00 |
|
Thomas
|
7ecb677d97
|
ok ca se lance
|
2022-01-10 16:01:32 +01:00 |
|
|
|
1e6892f6b1
|
end menu score display
|
2022-01-10 15:31:07 +01:00 |
|
Thomas
|
36d6b21613
|
Async sprites loading
|
2022-01-10 14:27:16 +01:00 |
|
