Sagittaeri
|
831cd9ab4f
|
merged again
|
8 years ago |
Sagittaeri
|
e0ad45a5e7
|
removed junk file
|
8 years ago |
Sagittaeri
|
3aba96ee8b
|
merged
|
8 years ago |
ATC522-011\IGDA
|
6bc407df6f
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad
|
8 years ago |
ATC522-011\IGDA
|
5f37b0795b
|
no message
|
8 years ago |
Sagittaeri
|
c0819f5fa6
|
added searchlight chase v2
|
8 years ago |
Sagittaeri
|
6cb91596a1
|
added searchlight chase
|
8 years ago |
Joshua Reason
|
d9766ae266
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad
|
8 years ago |
Joshua Reason
|
53ad7e12dc
|
Added boat to scene
|
8 years ago |
ATC522-011\IGDA
|
fcd7d7f4e8
|
no message
|
8 years ago |
ATC522-011\IGDA
|
6f58c9c269
|
no message
|
8 years ago |
Joshua Reason
|
5def2651a9
|
Added water plan back to assets
|
8 years ago |
ATC522-011\IGDA
|
1b75b59ccd
|
no message
|
8 years ago |
ATC522-011\IGDA
|
d753bc6986
|
- new trees
- new spot light
- new lighthouse
-new alot of stuff
|
8 years ago |
Joshua Reason
|
33da7c3282
|
MAde push consistant
|
8 years ago |
Joshua Reason
|
0b3d2870b4
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad
|
8 years ago |
Joshua Reason
|
a752d9d244
|
updated water shader
|
8 years ago |
ATC522-011\IGDA
|
fe5a00a0b6
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad
|
8 years ago |
ATC522-011\IGDA
|
798d414504
|
no message
|
8 years ago |
Joshua Reason
|
af9d8d1cbb
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad
|
8 years ago |
Joshua Reason
|
deabf49ab8
|
Fixed some inheritance and added Heavyobject class
|
8 years ago |
ATC522-011\IGDA
|
9c1024d1f9
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad
|
8 years ago |
ATC522-011\IGDA
|
b00ec8406d
|
-pushed for JOSH!
|
8 years ago |
Sagittaeri
|
466fe42c5c
|
added anim curve
|
8 years ago |
ATC522-011\IGDA
|
75465331ad
|
- changed lighthouse set path
- changed code to world.posistion
|
8 years ago |
Sagittaeri
|
771babe235
|
auto populate spline points
|
8 years ago |
Sagittaeri
|
ff46545bfd
|
merged
|
8 years ago |
Sagittaeri
|
087dc1181b
|
lighthouse searchlight spline
|
8 years ago |
ATC522-011\IGDA
|
8d44ad0536
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad
# Conflicts:
# IronToad_UnityProject/Assets/Art/terrainTextures/Rock_sandColored_2k_alb.png.meta
# IronToad_UnityProject/Assets/New Terrain 1.asset
|
8 years ago |
ATC522-011\IGDA
|
f4dbb7a45b
|
-replacing all terrain textures with new ones
-adding colliders to all rocks
-painting the terrain
|
8 years ago |
PACO_BEAST\info
|
4aebbd1831
|
changes Paco
|
8 years ago |
ATC522-011\IGDA
|
54cf6e5821
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad
|
8 years ago |
ATC522-011\IGDA
|
2442551af9
|
-just edited the lvl map a bit more
|
8 years ago |
Joshua Reason
|
246714c6cd
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad
|
8 years ago |
Joshua Reason
|
93a3265d84
|
Added one texture shader
|
8 years ago |
ATC522-011\IGDA
|
e998f810b5
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad
|
8 years ago |
ATC522-011\IGDA
|
f9becac054
|
-updated terrain
-plotted some rocks
-new tone shaders
|
8 years ago |
Joshua Reason
|
2358904fef
|
Added Toon texture shader
|
8 years ago |
Joshua Reason
|
70de03e2e9
|
Merge
|
8 years ago |
Joshua Reason
|
2596c19deb
|
Waves exist + basic boat scripts
|
8 years ago |
Sagittaeri
|
c78a3629de
|
added git ignore back in
|
8 years ago |
Sagittaeri
|
9ffc81f818
|
MAYBE removed library??
|
8 years ago |
Sagittaeri
|
d36c2458b8
|
ui stuff
|
8 years ago |
Sagittaeri
|
a47562770f
|
without lib
|
8 years ago |
Sagittaeri
|
dea8941ee3
|
Test
|
8 years ago |
PACO_BEAST\info
|
1bf3fad977
|
textures
|
8 years ago |
PACO_BEAST\info
|
76bf450dd6
|
ToonRock
|
8 years ago |
PACO_BEAST\info
|
56aa0bec35
|
Rocks added
|
8 years ago |
PACO_BEAST\info
|
05f7b70eeb
|
Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad
# Conflicts:
# IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity
# IronToad_UnityProject/Library/assetDatabase3
|
8 years ago |
PACO_BEAST\info
|
01f2b31d04
|
changes
|
8 years ago |