87 Commits

Author SHA1 Message Date
hugo.baldassin@epitech.eu
6900226e64 [EDIT] some fixes and tweaks for the cars 2019-05-30 09:15:33 +02:00
Nathan Scutari
70229696c4 arrow fix 2019-05-30 16:04:40 +09:00
Nathan Scutari
f107a99e7d Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage 2019-05-28 10:30:11 +09:00
Nathan Scutari
a62e5b32fc camera fix 2019-05-28 10:29:53 +09:00
fe86c860d4 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage 2019-05-27 23:51:28 +09:00
8d6bf2eb1a fixed IP display 2019-05-27 23:51:23 +09:00
Nathan Scutari
caa2439443 build fix 2019-05-26 19:03:56 +09:00
Nathan Scutari
c0a328b58d Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage 2019-05-24 09:59:15 +09:00
Nathan Scutari
4bdd4f728e objective modif 2019-05-24 09:58:57 +09:00
hugo.baldassin@epitech.eu
c29ceaeb03 [EDIT] some tweaks for the alpha 2019-05-23 19:38:07 +02:00
Nathan Scutari
a38c45668f missing add 2019-05-24 01:39:39 +09:00
Nathan Scutari
623c7ca6f9 UI Update 2019-05-24 01:35:56 +09:00
Nathan Scutari
fd4b3e77a7 map 2019-05-24 01:22:48 +09:00
Nathan Scutari
48661a9464 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage 2019-05-24 00:46:23 +09:00
Nathan Scutari
bc9e37df6e prefab 2019-05-24 00:46:18 +09:00
f4639177d3 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage 2019-05-24 00:44:52 +09:00
bc75b6b0de Prefab-ing the Car Stand in the lobby 2019-05-24 00:44:41 +09:00
Nathan Scutari
a5d3316149 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage 2019-05-24 00:18:28 +09:00
Nathan Scutari
75e2c77d83 custom player spawn 2019-05-24 00:18:15 +09:00
hugo.baldassin@epitech.eu
4262a91c81 [EDIT] cars adjustments 2019-05-23 15:08:50 +02:00
Julien
179007360d Map added 2019-05-23 17:58: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
Hugo Willaume
367d5ed752 Added script to get the correct car prefab (and weapon later, currently disabled) from the player identity 2019-05-23 15:56:51 +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
2e71a2aff4 Reset packages to initial state to fix Tower Defence Turrets plugin 2019-05-15 17:54:56 +09:00
Alexandre Saubusse
37002fe7e6 bon alors 2019-05-14 06:23:41 +02:00
Alexandre Saubusse
a676a64317 merge aie aie aie 2019-05-14 06:19:25 +02:00
hugo.baldassin@epitech.eu
5f94aeec5b erge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage 2019-05-14 05:23:47 +02:00
hugo.baldassin@epitech.eu
e00caf2eb8 [ADD] collectables resources 2019-05-14 05:20:49 +02:00
Alexandre Saubusse
d93e2b020b ajout Tower defence 2019-05-14 04:01:20 +02:00
Hugo Willaume
79efbfab43 Fixed anchors in menus && User UI canvas 2019-05-14 10:08:59 +09:00
Alexandre Saubusse
dd476b76c4 camera viseur 2019-05-14 02:27:36 +02: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
eca5540746 Player UI : Currently with speed-o-meter, Score, Timer, Health and Leaderboard position 2019-05-13 19:38:11 +09:00
Hugo Willaume
93d5fe4e59 Starting user UI 2019-05-13 16:33:34 +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
329f47cdc1 Models on the fly in the menus for the weapons 2019-05-05 21:51:17 +09:00
642f80b768 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage 2019-05-05 16:34:43 +09:00
c9bccb8fb9 Visual car change when the player navigates the menu 2019-05-05 16:32:48 +09:00
hugo.baldassin@epitech.eu
1f90cdc41f [ADD] network working smoothly with collisions and transforms 2019-05-05 07:18:09 +02: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