Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• fcd496a69f merge / kill objective / arrow is back master Nathan Scutari 2019-06-13 22:22:57 +09:00
• d2f92afd18 t pushMerge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Hugo Willaume 2019-06-13 16:07:59 +09:00
• 301664716b Fixed Lobby UI layering on changing tab during changing unit Hugo Willaume 2019-06-13 16:07:54 +09:00
• 533891e97c [EDIT] minigun tweaks hugo.baldassin@epitech.eu 2019-06-13 08:45:59 +02:00
• b3142f5725 [EDIT] health pack adds health hugo.baldassin@epitech.eu 2019-06-13 08:33:09 +02:00
• 4aade582d4 weapons damage nerf / objective tag Hugo Willaume 2019-06-13 14:50:28 +09:00
• c8c6e8a709 Fixed defaults in weapon/car choice lobby Hugo Willaume 2019-06-13 14:14:30 +09:00
• f2156ba671 merging Hugo Willaume 2019-06-13 13:07:36 +09:00
• 7dd944f184 [EDIT] collectables working hugo.baldassin@epitech.eu 2019-06-13 04:45:03 +02:00
• 4eb9a45753 Fixing transition to leaderboard Hugo Willaume 2019-06-13 11:43:33 +09:00
• 6c25f5d765 small changes to GameManager Hurlu 2019-06-13 08:12:28 +09:00
• 863ec78e72 New map added Julien 2019-06-12 20:26:35 +09:00
• a2ad724787 [EDIT] recreated collectable network, not tested yet hugo.baldassin@epitech.eu 2019-06-12 09:04:59 +02:00
• fd55832727 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Nathan Scutari 2019-06-11 15:55:18 +09:00
• ef6c76f18c various fixes Nathan Scutari 2019-06-11 15:55:02 +09:00
• a510f42799 Fix kick in network lobby and clamped lobby countdown to 0 Hugo Willaume 2019-06-11 12:50:45 +09:00
• 2ae1c330da Fixed Local IP Hugo Willaume 2019-06-11 11:52:57 +09:00
• 930004cb0e cars hp Nathan Scutari 2019-06-11 11:45:58 +09:00
• 25c227adc5 audio listener fix / network fix Nathan Scutari 2019-06-11 11:25:08 +09:00
• 687be0174d bug fixes Nathan Scutari 2019-06-11 09:29:48 +09:00
• a4aacf5cd4 weapons Nathan Scutari 2019-06-11 00:57:56 +09:00
• 99c74b6048 merge Nathan Scutari 2019-06-07 23:35:44 +09:00
• 1987853a5e timer end Nathan Scutari 2019-06-07 23:33:54 +09:00
• d5fda66113 minor fixes Hurlu 2019-06-02 18:41:05 +09:00
• 9a7c031dcd Finished graphical handling of leaderboard, network to be tested Hurlu 2019-06-02 17:44:10 +09:00
• 1e077fdd53 Finished the graphic aspect of the leaderboard Hurlu 2019-05-31 17:12:29 +09:00
• 45e6abf3ee Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Hugo Willaume 2019-05-30 20:12:50 +09:00
• 19804189f4 Started graphic elements of end of game UI Hugo Willaume 2019-05-30 20:12:34 +09:00
• 6900226e64 [EDIT] some fixes and tweaks for the cars hugo.baldassin@epitech.eu 2019-05-30 09:15:33 +02:00
• 70229696c4 arrow fix Nathan Scutari 2019-05-30 16:04:40 +09:00
• f107a99e7d Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Nathan Scutari 2019-05-28 10:30:11 +09:00
• a62e5b32fc camera fix Nathan Scutari 2019-05-28 10:29:53 +09:00
• fe86c860d4 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Hurlu 2019-05-27 23:51:28 +09:00
• 8d6bf2eb1a fixed IP display Hurlu 2019-05-27 23:51:23 +09:00
• caa2439443 build fix Nathan Scutari 2019-05-26 19:03:56 +09:00
• c0a328b58d Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Nathan Scutari 2019-05-24 09:59:15 +09:00
• 4bdd4f728e objective modif Nathan Scutari 2019-05-24 09:58:57 +09:00
• c29ceaeb03 [EDIT] some tweaks for the alpha hugo.baldassin@epitech.eu 2019-05-23 19:38:07 +02:00
• a38c45668f missing add Nathan Scutari 2019-05-24 01:39:39 +09:00
• 623c7ca6f9 UI Update Nathan Scutari 2019-05-24 01:35:56 +09:00
• fd4b3e77a7 map Nathan Scutari 2019-05-24 01:22:48 +09:00
• 48661a9464 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Nathan Scutari 2019-05-24 00:46:23 +09:00
• bc9e37df6e prefab Nathan Scutari 2019-05-24 00:46:18 +09:00
• f4639177d3 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Hurlu 2019-05-24 00:44:52 +09:00
• bc75b6b0de Prefab-ing the Car Stand in the lobby Hurlu 2019-05-24 00:44:41 +09:00
• a5d3316149 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Nathan Scutari 2019-05-24 00:18:28 +09:00
• 75e2c77d83 custom player spawn Nathan Scutari 2019-05-24 00:18:15 +09:00
• 4262a91c81 [EDIT] cars adjustments hugo.baldassin@epitech.eu 2019-05-23 15:08:50 +02:00
• 179007360d Map added Julien 2019-05-23 17:58:15 +09:00
• 038b36bf74 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Nathan Scutari 2019-05-23 17:32:20 +09:00
• f02570adcb in progress Nathan Scutari 2019-05-23 17:32:18 +09:00
• 56d0947559 Added number of players in PlayerIdentity Hugo Willaume 2019-05-23 17:14:15 +09:00
• 367d5ed752 Added script to get the correct car prefab (and weapon later, currently disabled) from the player identity Hugo Willaume 2019-05-23 15:56:51 +09:00
• 3800012e87 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Nathan Scutari 2019-05-23 14:58:56 +09:00
• 5d87512a1f ? Nathan Scutari 2019-05-23 14:58:50 +09:00
• 2e71a2aff4 Reset packages to initial state to fix Tower Defence Turrets plugin Hurlu 2019-05-15 17:54:56 +09:00
• 37002fe7e6 bon alors Alexandre Saubusse 2019-05-14 06:23:41 +02:00
• a676a64317 merge aie aie aie Alexandre Saubusse 2019-05-14 06:19:25 +02:00
• 5f94aeec5b erge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage hugo.baldassin@epitech.eu 2019-05-14 05:23:47 +02:00
• e00caf2eb8 [ADD] collectables resources hugo.baldassin@epitech.eu 2019-05-14 05:20:49 +02:00
• d93e2b020b ajout Tower defence Alexandre Saubusse 2019-05-14 04:01:20 +02:00
• 79efbfab43 Fixed anchors in menus && User UI canvas Hugo Willaume 2019-05-14 10:08:59 +09:00
• dd476b76c4 camera viseur Alexandre Saubusse 2019-05-14 02:27:36 +02:00
• 601ec863da merge Nathan Scutari 2019-05-14 00:27:41 +09:00
• 9b2ac8e1b8 weapon shot network implementation Nathan Scutari 2019-05-14 00:10:15 +09:00
• eca5540746 Player UI : Currently with speed-o-meter, Score, Timer, Health and Leaderboard position Hurlu 2019-05-13 19:38:11 +09:00
• 93d5fe4e59 Starting user UI Hugo Willaume 2019-05-13 16:33:34 +09:00
• a349fa23bd Generating objectives in the menus, displaying them to the player Hugo Willaume 2019-05-09 16:22:36 +09:00
• f0096352dc slight correction of the lobby scene Hugo Willaume 2019-05-07 09:32:35 +09:00
• 4909f96f35 forgot to save scene before commit Hurlu 2019-05-05 22:04:56 +09:00
• 329f47cdc1 Models on the fly in the menus for the weapons Hurlu 2019-05-05 21:51:17 +09:00
• 642f80b768 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Hurlu 2019-05-05 16:34:43 +09:00
• c9bccb8fb9 Visual car change when the player navigates the menu Hurlu 2019-05-05 16:32:48 +09:00
• 1f90cdc41f [ADD] network working smoothly with collisions and transforms hugo.baldassin@epitech.eu 2019-05-05 07:18:09 +02:00
• bef2d620f6 GameManager merged with network / playable on localsimulator scene Nathan Scutari 2019-05-03 01:54:41 +09:00
• 3a508af6ce Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Nathan Scutari 2019-05-02 23:00:30 +09:00
• 579e7dce6d SmoothSync Nathan Scutari 2019-05-02 22:59:46 +09:00
• c4dd672142 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Hugo Willaume 2019-05-02 19:46:46 +09:00
• b9212ea1a3 Put in place the system for displaying the choice of weapons / cars / powers Hugo Willaume 2019-05-02 19:46:40 +09:00
• 4a56795ada merge Nathan Scutari 2019-05-02 16:08:24 +09:00
• 6126105309 objective display Nathan Scutari 2019-05-02 16:05:14 +09:00
• 44ee8bbbcf [EDIT] implemented network for other cars hugo.baldassin@epitech.eu 2019-04-30 02:28:01 +02:00
• 542b330996 [EDIT] edied prefabs for no skid sound and netork integration; Aedanc 2019-04-26 16:54:37 +09:00
• d2b8d429f1 Managed to cleanly change networkmanagers from menu to game Hugo Willaume 2019-04-25 11:44:14 +09:00
• 90bdf07694 Working towards the baton pass between the menu network manager and the game network manager Hurlu 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 Hurlu 2019-04-24 16:25:54 +09:00
• 1c2d9553ce WaitingLobby menu finished Hurlu 2019-04-23 22:47:14 +09:00
• 61daa020fc Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Hugo Willaume 2019-04-23 21:06:29 +09:00
• dd83111d6b Some work on menus Hugo Willaume 2019-04-23 21:06:24 +09:00
• 38011623cc weapon system package Alexandre Saubusse 2019-04-23 05:55:42 +02:00
• fdea4b68a4 Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Nathan Scutari 2019-04-23 10:06:27 +09:00
• 486a6d0205 Instantiation fix Nathan Scutari 2019-04-23 10:05:58 +09:00
• fecb25785f Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage Hurlu 2019-04-23 00:06:27 +09:00
• ef56d7ea32 Carnage menu network almost done Hurlu 2019-04-23 00:06:17 +09:00
• 219f06b4ae local simulator with waypoints objective Nathan Scutari 2019-04-22 00:52:30 +09:00
• c6bace698a Objectives / Game management / Stats Scripts Nathan Scutari 2019-04-21 20:17:21 +09:00
• f034388fbd Objectives / Game management / Stats Scripts Nathan Scutari 2019-04-21 20:16:16 +09:00
• e7ad60c780 Mashalla le network est ok Aedanc 2019-04-20 15:08:22 +09:00
• fd03fd157f [EDIT] push car prefabs; hugo.baldassin@epitech.eu 2019-04-20 07:59:00 +02:00
• cbcebccbd5 [EDIT0] drift sound on stop fixed, still triggers some times on collision; hugo.baldassin@epitech.eu 2019-04-20 07:36:17 +02:00