Skip to content

Nouveau test #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Timingmerkat83 wants to merge 126 commits into
base: main
from
Open

Nouveau test #4

Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
389ee40
Scène 1945
Timingmerkat83 Nov 19, 2024
721333a
mappp
matisgh Nov 19, 2024
5b6c832
Scenes ikrame
ikramert Nov 19, 2024
6cd319f
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
ikramert Nov 19, 2024
5420cad
Resized map
Timingmerkat83 Nov 19, 2024
756f26d
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Nov 19, 2024
244a558
Added doors with hinge points
Timingmerkat83 Nov 21, 2024
dbe603d
Ajout script d'écran de chargement entre scènes
Timingmerkat83 Nov 21, 2024
bd0d305
Resised my map
Timingmerkat83 Nov 21, 2024
4d5e9e7
finishing this later
Timingmerkat83 Nov 21, 2024
26cce55
Changement scène PL
Timingmerkat83 Nov 21, 2024
cf03eec
sdaw
matisgh Nov 24, 2024
f3b7598
ikrame_scene
ikramert Nov 24, 2024
7aac637
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
ikramert Nov 24, 2024
303d576
dd
matisgh Nov 25, 2024
bcd91ca
gg
matisgh Nov 25, 2024
a16046d
tunnel
Timingmerkat83 Nov 25, 2024
b97b875
Ajoute de l'ascenseur
Timingmerkat83 Nov 25, 2024
1efbfb0
Almost finished map and now the code
Timingmerkat83 Nov 25, 2024
b78657f
Updated map
Timingmerkat83 Nov 25, 2024
eb3d292
renaissance
ikramert Nov 26, 2024
fbfe341
export statue
ikramert Nov 26, 2024
77aedd4
Update Ikrame_Renaissance.unity
ikramert Nov 26, 2024
a2e94f7
Ajout assets
Timingmerkat83 Nov 26, 2024
c35d206
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Nov 26, 2024
9b63fb7
Update Ikrame_Renaissance.unity
ikramert Nov 26, 2024
9a1d88c
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Nov 26, 2024
c4b4459
ok
Timingmerkat83 Nov 26, 2024
196d843
Ajoute de box coliders
Timingmerkat83 Nov 26, 2024
ce32c87
ajout box colliders
Timingmerkat83 Nov 26, 2024
525932e
scene renaissance
ikramert Nov 26, 2024
bc06846
renaissance
ikramert Nov 26, 2024
001f5b5
Ajout de chargement de scène dans toutes les scènes
Timingmerkat83 Nov 26, 2024
b30bdb8
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Nov 26, 2024
d3aacd6
lightttt
matisgh Nov 26, 2024
db856ed
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
matisgh Nov 26, 2024
88090bd
yes
Timingmerkat83 Nov 26, 2024
41fb1cf
wswd
matisgh Nov 26, 2024
890d750
Okay
Timingmerkat83 Nov 26, 2024
954200b
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Nov 26, 2024
f9d0533
Revert "wswd"
matisgh Nov 26, 2024
b3bdccd
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
matisgh Nov 26, 2024
ec5d09d
test
matisgh Nov 26, 2024
f25c8b9
yes
Timingmerkat83 Nov 26, 2024
6d6f083
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Nov 26, 2024
c8a310e
ok
Timingmerkat83 Nov 26, 2024
b2ca611
Renaissance changement scene
ikramert Nov 26, 2024
3747cad
Refaire touche
Timingmerkat83 Nov 26, 2024
ad0a0e7
yes
Timingmerkat83 Nov 26, 2024
98cc41d
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Nov 26, 2024
2be9dd6
Renaissance changement scene
ikramert Nov 26, 2024
82db3ae
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
ikramert Nov 26, 2024
301efa9
wwww
matisgh Nov 26, 2024
cc3bdbe
sss
matisgh Nov 26, 2024
ad45953
map changes and light flickering script
Timingmerkat83 Nov 26, 2024
b8d2c1a
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Nov 26, 2024
3abc5ba
Changing stuff to map
Timingmerkat83 Nov 26, 2024
2c51953
Changement sc;ene de matis
Timingmerkat83 Nov 26, 2024
9506116
Changements Joueur
ikramert Nov 26, 2024
01e8d3e
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
ikramert Nov 26, 2024
01f2e04
yes
Timingmerkat83 Nov 26, 2024
31583da
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Nov 26, 2024
d660527
daddw
matisgh Nov 26, 2024
bc0c29d
yes
Timingmerkat83 Nov 26, 2024
1b30ddd
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Nov 26, 2024
70600a9
Ikrame renaissance
ikramert Nov 26, 2024
4524415
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
ikramert Nov 26, 2024
1fe310b
alr
matisgh Nov 26, 2024
8b5666a
Added stuff to lobby part of the level
Timingmerkat83 Nov 26, 2024
4ddcf1a
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Nov 26, 2024
712d2f9
ajout décoration dans ma scène
Timingmerkat83 Nov 27, 2024
f60bc50
Renaissance
ikramert Nov 28, 2024
e694a38
Editing scene
Timingmerkat83 Nov 28, 2024
b32503a
editing sound
Timingmerkat83 Nov 28, 2024
2459f77
yep
Timingmerkat83 Nov 28, 2024
2c09b0c
yep
Timingmerkat83 Nov 28, 2024
ee538df
adding interacting manager to some objects of the scene
Timingmerkat83 Dec 1, 2024
64616a6
added more interacteble objects
Timingmerkat83 Dec 1, 2024
7b72715
hm
Timingmerkat83 Dec 1, 2024
45030d7
Added elevator to scene and new spawn point
Timingmerkat83 Dec 2, 2024
01fcd00
added combinationlock script
Timingmerkat83 Dec 2, 2024
ba6da76
added 2 scripts
Timingmerkat83 Dec 2, 2024
bc9075b
Added GameManager Script
Timingmerkat83 Dec 2, 2024
e993d73
updated player script
Timingmerkat83 Dec 2, 2024
af9122f
Script meta and fixing compilation errors
Timingmerkat83 Dec 2, 2024
4e13748
Fixed Compiled errors
Timingmerkat83 Dec 2, 2024
e29dc05
starting code script
Timingmerkat83 Dec 2, 2024
84d319b
renaissance
ikramert Dec 2, 2024
0ecc8e6
anim porte pas marcher
matisgh Dec 2, 2024
1cde225
Renaissance
ikramert Dec 3, 2024
a7751ae
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
ikramert Dec 3, 2024
59866a1
Ajout transition dans la scène d'ikrame
Timingmerkat83 Dec 3, 2024
579e37a
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Dec 3, 2024
5d25260
Ajout ascenceur Matis
ikramert Dec 3, 2024
ae320a8
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
ikramert Dec 3, 2024
a262bfd
fczsc
matisgh Dec 3, 2024
4332298
yes
Timingmerkat83 Dec 3, 2024
7df0584
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Dec 3, 2024
c3fb32c
renaissance changement scene
ikramert Dec 3, 2024
4a88cf3
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
ikramert Dec 3, 2024
1a8d8d9
edited office room
Timingmerkat83 Dec 3, 2024
156889d
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
Timingmerkat83 Dec 3, 2024
527a810
yes
Timingmerkat83 Dec 3, 2024
dd26771
Ajout script et changement scene Renaissance
ikramert Dec 3, 2024
bb198d7
eau ajout
ikramert Dec 3, 2024
8f52612
Scripts
ikramert Dec 3, 2024
a391d3a
ddddddd
matisgh Dec 3, 2024
e5b125c
Update IR_Renaissance.unity
ikramert Dec 3, 2024
18e4e1b
awdadaw
matisgh Dec 3, 2024
970636f
Box colliders
ikramert Dec 3, 2024
6883f5b
Merge branch 'NouveauTest' of https://github.com/Chrono-Escape-Projec…
ikramert Dec 3, 2024
18b8a96
Add shader
ikramert Dec 3, 2024
d21109d
Modified scene
Timingmerkat83 Dec 3, 2024
d60203b
Changement scene et script
ikramert Dec 3, 2024
a8fafca
yrd
Timingmerkat83 Dec 3, 2024
bbe7b07
added keypad puzzle
Timingmerkat83 Dec 3, 2024
a5f94f4
yes
Timingmerkat83 Dec 3, 2024
6d9615c
added onclick events to keypad
Timingmerkat83 Dec 3, 2024
5b71fd8
Scripts changement scene
ikramert Dec 3, 2024
7e6fb5f
Scripts changement scene
ikramert Dec 3, 2024
8c8402d
Create URP_ExtractMe.unitypackage.meta
ikramert Dec 5, 2024
7cd7076
adding colliders
Timingmerkat83 Dec 6, 2024
8a9b2e4
trash
Timingmerkat83 Dec 6, 2024
5f00758
finished colliders
Timingmerkat83 Dec 6, 2024
ba08a77
added more colliders
Timingmerkat83 Dec 6, 2024
8f4a312
yyes
Timingmerkat83 Dec 9, 2024

Sorry, this diff is taking too long to generate.

It may be too large to display on GitHub.