Nathan Scutari
|
fcd496a69f
|
merge / kill objective / arrow is back
|
2019-06-13 22:22:57 +09:00 |
|
Hugo Willaume
|
f2156ba671
|
merging
|
2019-06-13 13:50:04 +09:00 |
|
hugo.baldassin@epitech.eu
|
7dd944f184
|
[EDIT] collectables working
|
2019-06-13 04:45:03 +02:00 |
|
Hugo Willaume
|
4eb9a45753
|
Fixing transition to leaderboard
|
2019-06-13 11:43:33 +09:00 |
|
hugo.baldassin@epitech.eu
|
a2ad724787
|
[EDIT] recreated collectable network, not tested yet
|
2019-06-12 09:04:59 +02:00 |
|
Nathan Scutari
|
930004cb0e
|
cars hp
|
2019-06-11 11:45:58 +09:00 |
|
Nathan Scutari
|
a4aacf5cd4
|
weapons
|
2019-06-11 00:57:56 +09:00 |
|
Nathan Scutari
|
99c74b6048
|
merge
|
2019-06-07 23:35:44 +09:00 |
|
Nathan Scutari
|
1987853a5e
|
timer end
|
2019-06-07 23:33:54 +09:00 |
|
|
d5fda66113
|
minor fixes
|
2019-06-02 18:41:05 +09:00 |
|
|
9a7c031dcd
|
Finished graphical handling of leaderboard, network to be tested
|
2019-06-02 17:44:28 +09:00 |
|
|
1e077fdd53
|
Finished the graphic aspect of the leaderboard
|
2019-05-31 17:12:29 +09:00 |
|
Hugo Willaume
|
45e6abf3ee
|
Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage
|
2019-05-30 20:12:50 +09:00 |
|
Hugo Willaume
|
19804189f4
|
Started graphic elements of end of game UI
|
2019-05-30 20:12:34 +09:00 |
|
Nathan Scutari
|
70229696c4
|
arrow fix
|
2019-05-30 16:04:40 +09:00 |
|
Nathan Scutari
|
caa2439443
|
build fix
|
2019-05-26 19:03:56 +09:00 |
|
hugo.baldassin@epitech.eu
|
c29ceaeb03
|
[EDIT] some tweaks for the alpha
|
2019-05-23 19:38:07 +02:00 |
|
Nathan Scutari
|
fd4b3e77a7
|
map
|
2019-05-24 01:22:48 +09:00 |
|
Nathan Scutari
|
bc9e37df6e
|
prefab
|
2019-05-24 00:46:18 +09:00 |
|
Nathan Scutari
|
75e2c77d83
|
custom player spawn
|
2019-05-24 00:18:15 +09:00 |
|
Nathan Scutari
|
038b36bf74
|
Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage
|
2019-05-23 17:32:20 +09:00 |
|
Nathan Scutari
|
f02570adcb
|
in progress
|
2019-05-23 17:32:18 +09:00 |
|
Hugo Willaume
|
56d0947559
|
Added number of players in PlayerIdentity
|
2019-05-23 17:14:15 +09:00 |
|
Nathan Scutari
|
3800012e87
|
Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage
|
2019-05-23 14:58:56 +09:00 |
|
Nathan Scutari
|
5d87512a1f
|
?
|
2019-05-23 14:58:50 +09:00 |
|
Hugo Willaume
|
79efbfab43
|
Fixed anchors in menus && User UI canvas
|
2019-05-14 10:08:59 +09:00 |
|
Nathan Scutari
|
601ec863da
|
merge
|
2019-05-14 00:27:41 +09:00 |
|
Nathan Scutari
|
9b2ac8e1b8
|
weapon shot network implementation
|
2019-05-14 00:10:15 +09:00 |
|
Hugo Willaume
|
a349fa23bd
|
Generating objectives in the menus, displaying them to the player
|
2019-05-09 16:22:36 +09:00 |
|
Hugo Willaume
|
f0096352dc
|
slight correction of the lobby scene
|
2019-05-07 09:32:35 +09:00 |
|
|
4909f96f35
|
forgot to save scene before commit
|
2019-05-05 22:04:56 +09:00 |
|
|
c9bccb8fb9
|
Visual car change when the player navigates the menu
|
2019-05-05 16:32:48 +09:00 |
|
Nathan Scutari
|
bef2d620f6
|
GameManager merged with network / playable on localsimulator scene
|
2019-05-03 01:54:41 +09:00 |
|
Nathan Scutari
|
3a508af6ce
|
Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage
|
2019-05-02 23:00:30 +09:00 |
|
Nathan Scutari
|
579e7dce6d
|
SmoothSync
|
2019-05-02 22:59:46 +09:00 |
|
Hugo Willaume
|
c4dd672142
|
Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage
|
2019-05-02 19:46:46 +09:00 |
|
Hugo Willaume
|
b9212ea1a3
|
Put in place the system for displaying the choice of weapons / cars / powers
|
2019-05-02 19:46:40 +09:00 |
|
Nathan Scutari
|
4a56795ada
|
merge
|
2019-05-02 16:08:24 +09:00 |
|
Nathan Scutari
|
6126105309
|
objective display
|
2019-05-02 16:05:14 +09:00 |
|
hugo.baldassin@epitech.eu
|
44ee8bbbcf
|
[EDIT] implemented network for other cars
|
2019-04-30 02:28:01 +02:00 |
|
Hugo Willaume
|
d2b8d429f1
|
Managed to cleanly change networkmanagers from menu to game
|
2019-04-25 11:44:14 +09:00 |
|
|
90bdf07694
|
Working towards the baton pass between the menu network manager and the game network manager
|
2019-04-25 08:23:48 +09:00 |
|
|
04496e121e
|
Resurrection de la NetworkTest scene après que ça aie pété avec une scène du même nom que j'avais supprimée dans un commit local
|
2019-04-24 16:25:54 +09:00 |
|
|
1c2d9553ce
|
WaitingLobby menu finished
|
2019-04-23 22:47:14 +09:00 |
|
Hugo Willaume
|
61daa020fc
|
Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage
|
2019-04-23 21:06:29 +09:00 |
|
Hugo Willaume
|
dd83111d6b
|
Some work on menus
|
2019-04-23 21:06:24 +09:00 |
|
Nathan Scutari
|
fdea4b68a4
|
Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage
|
2019-04-23 10:06:27 +09:00 |
|
Nathan Scutari
|
486a6d0205
|
Instantiation fix
|
2019-04-23 10:05:58 +09:00 |
|
|
fecb25785f
|
Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage
|
2019-04-23 00:06:27 +09:00 |
|
|
ef56d7ea32
|
Carnage menu network almost done
|
2019-04-23 00:06:17 +09:00 |
|