Epitech/T-DEV-811
4
0
Fork 0
Code Issues 7 Pull Requests 1 Packages Projects 1 Releases Wiki Activity
51 Commits 7 Branches 1 Tag
Commit Graph

51 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nico
71a07cc552 Merge pull request 'feat/AR_Architecture' (#37) from feat/AR_Architecture into master 
Reviewed-on: Epitech-T-DEV-811/T-DEV-811#37
Reviewed-by: 5OLE1L <mathis.ragot@epitech.eu>
Reviewed-by: Clement <clement@jo85.com>
 2023-04-24 09:54:04 +02:00
nico
b1787886c6 Merge branch 'master' into feat/AR_Architecture 2023-04-24 09:53:37 +02:00
Nicolas SANS
75018ee6cd edited README.md 2023-04-18 16:10:44 +02:00
Nicolas SANS
782af8c90d edited git attributes file 2023-04-18 15:52:22 +02:00
Nicolas SANS
ac5cb75407 Migrating to Vuforia, Adding multitarget system 2023-04-18 15:40:00 +02:00
nico
8928ab9922 Merge pull request 'feat/AR_Architecture' (#33) from feat/AR_Architecture into master 
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/33
Reviewed-by: Clement <clement@jo85.com>
 2023-04-11 16:09:36 +02:00
Nicolas SANS
38824485c0 Merge remote-tracking branch 'origin/master' into feat/AR_Architecture 
# Conflicts:
#	.gitignore
 2023-04-11 14:08:54 +02:00
Clement
9a77d3163f Merge pull request 'docs: Doxy-API-et-diagramme-API' (#25) from docs/Doxy-API-et-diagramme-API into master 
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/25
Reviewed-by: nico <nicolas.sansd@gmail.com>
Reviewed-by: Guska <gildas.gonzalez@epitech.eu>
 2023-04-11 13:53:42 +02:00
Nicolas SANS
c092e3d426 Adding trash api values when scanning a specific marker 2023-04-11 13:47:42 +02:00
Nicolas SANS
af5acdae96 Adding env.example file and env unity plugin 2023-04-11 08:53:41 +02:00
nico
978ce41fcf Merge pull request 'feat/trash_marker' (#29) from feat/trash_marker into feat/AR_Architecture 
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/29
 2023-04-11 10:39:24 +02:00
Nicolas SANS
13b0bdcfb0 adding basic scene with marker detection 2023-04-11 07:57:25 +02:00
Clement
b921edd04b typo 2023-04-04 10:57:46 +02:00
Clement
62651ca606 docs(iot): create diagram class 2023-04-04 10:56:27 +02:00
Clement
aba69c8181 fix: doc and typo 2023-04-04 10:55:39 +02:00
Clement
ab94d9fbf3 fix: typo 2023-04-04 10:45:44 +02:00
Clement
70f18faee5 feat: doxyfile 2023-04-04 10:41:45 +02:00
Clement
a6abcd4fe1 Merge pull request 'feat(IOT): LibAPI' (#21) from feat/LibAPI into master 
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/21
Reviewed-by: nico <nicolas.sansd@gmail.com>
 2023-04-03 16:55:12 +02:00
Clement
4bde578c35 update config 2023-04-03 16:30:44 +02:00
Clement
60bb2911f4 remove(iot): test in main programme 2023-04-03 16:30:34 +02:00
Clement
97ae6c6977 docs(iot): documentation de la lib api client 2023-04-03 16:23:59 +02:00
Clement
789cab74a9 refactor(iot): change type of connect on api 2023-04-03 16:19:32 +02:00
Clement
59728b9694 feat(iot): API Client OK 2023-04-03 16:07:57 +02:00
Clement
7861cfae51 feat: connection OK 2023-04-03 12:06:39 +02:00
Clement
3208c2ff6b feat(WIP): test main API lib 2023-04-03 11:10:12 +02:00
Clement
89ecb3bf17 feat: commentaire 2023-04-03 11:09:44 +02:00
Clement
c57225c1f3 feat(iot): connection wifi and API *UNTESTED* 2023-03-28 17:28:55 +02:00
Clement
98e0342fe1 feat(iot): constructeur API 2023-03-28 16:05:36 +02:00
Clement
bcfe0a07f8 Merge pull request 'feat: CAO link in readme' (#22) from clement-patch-1 into master 
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/22
 2023-03-28 07:39:17 +00:00
Clement
ad524cfc68 feat: CAO link in readme 2023-03-28 07:38:39 +00:00
Clement
e8ebe48128 feat: init api lib 2023-03-27 17:42:17 +02:00
Clement
31dfa751a3 feat: add deps 2023-03-27 17:41:53 +02:00
Clement
e56b92aa7b Merge pull request 'docs/diagram-API' (#10) from docs/diagram-API into master 
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/10
Reviewed-by: MDeghaud <michel.deghaud@epitech.eu>
Reviewed-by: nico <nicolas.sansd@gmail.com>
 2023-03-21 11:03:46 +00:00
Clement
d2a89b5a2c fix: rm useless field 2023-03-21 12:02:15 +01:00
Clement
c5576c2c63 fix: rename iot folder to IOT 2023-03-21 11:58:57 +01:00
Nicolas SANS
fd98c7bc0c Updated .gitignore 2023-03-21 11:52:53 +01:00
Nicolas SANS
781c1b4097 Adding AR folder 2023-03-21 11:46:52 +01:00
Clement
ab70befc0c fix little issue on API diagram 2023-03-21 11:42:48 +01:00
MDeghaud67
2e40495cc1 class data 2023-03-21 09:56:42 +01:00
Clement
2b91951a27 docs: mouve api diagram to rigt place 2023-03-20 12:57:41 +01:00
MDeghaud67
d6c473982e folders api/docs 2023-03-20 12:11:46 +01:00
MDeghaud67
25c5dd0b82 relation 2023-03-20 11:56:10 +01:00
MDeghaud67
94aad21613 relation and primary key 2023-03-20 11:06:45 +01:00
MDeghaud67
65b0befcc0 implémentation du diagramme de séquence 2023-03-20 10:03:46 +01:00
Clement
9b4afa2b74 Merge pull request 'feat:init IOT project' (#6) from feat/init-IOT into master 
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/6
Reviewed-by: nico <nicolas.sansd@gmail.com>
 2023-03-07 13:19:16 +00:00
Clement
3f3cc36e4c Merge branch 'master' into feat/init-IOT 2023-03-07 09:33:02 +00:00
Clément Boesmier
2c76f567b3 init main program object 2023-03-07 10:30:34 +01:00
Clement
366ce183d3 Merge pull request 'Mise à jour de 'README.md'' (#5) from fix/maj_readme into master 
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/5
 2023-03-07 09:07:52 +00:00
Clement
6831ce4fe9 Mise à jour de 'README.md' 2023-03-07 09:06:45 +00:00
Clément Boesmier
30a198b3b5 add initial IOT project 2023-03-06 15:15:14 +01:00