Simon Tran
07dea952c8
CHANGED:
> Checked the "Objective" checkbox on the trigger box on the objective engine.
Credits now trigger properly.
(Previous merge unchecked this for some reason)
9 years ago
Joshua Reason
6676662821
made objective trigger larger
9 years ago
Joshua Reason
65e4ab880a
Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker
Conflicts:
unity_Project/Assets/_Scenes/MainLevel.unity
9 years ago
Joshua Reason
67559709bd
getting both players to objective triggers credits
9 years ago
Simon Tran
98c176a952
CHANGED:
> Toggled off 2 x debug crates near the beginning area
9 years ago
Simon Tran
5400a93912
Resolved merge conflicts. Title Screen works as well as credits scene
9 years ago
Simon Tran
7729f5439f
Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker
Conflicts:
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_3D_objects.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Jeffrey.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Joshua.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Lachlan.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Simon.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_art_assets.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_developed.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_sound.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_text.png.meta
unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_trailer.png.meta
unity_Project/Assets/GUI Assets/UI_credits.png.meta
unity_Project/Assets/GUI Assets/buttons.meta
unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta
unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta
unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta
unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta
unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta
9 years ago
Simon Tran
e390ad00ac
ADDED:
+ Highlighted sprites for buttons
+ Close button sprites
+ Font File : "Motion Control" (for settings text)
CHANGED:
> Adjusted scale for some UI elements
> Replaced the placeholder minecart with the actual car object
9 years ago
Joshua Reason
0b8a556b66
credits now return to menu
9 years ago
Joshua Reason
c699545fe5
updated credits
9 years ago
Joshua Reason
165c2b76b0
Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker
9 years ago
Joshua Reason
2b00778789
Added more check points
Started on credit sequence
Scene Functionality
9 years ago
Simon Tran
0f5aa08097
ADDED:
+ Game trailer credit sign texture (crediting Lachlan for game trailer)
9 years ago
Simon Tran
9d1581e743
ADDED:
+ Credits UI Sprite
9 years ago
Simon Tran
2d84c3e043
ADDED:
+ 5 x Menu button sprites
9 years ago
Simon Tran
1cf5203d04
ADDED:
+ 10 x Credit sign textures
*NO toon-materials for these signs have been assigned yet.
9 years ago
Joshua Reason
106cb9985c
Last Sunday Push
9 years ago
Joshua Reason
41b8b26d49
Sunday night Mayhem push
9 years ago
Joshua Reason
d77fc72b4c
Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker
Conflicts:
unity_Project/Assets/Scripts/MagnetLaser.cs
unity_Project/Assets/_Scenes/MainLevel.unity
9 years ago
Joshua Reason
d5760a60c7
Started to implement title scene.
Magnets sparks on/off again
9 years ago
Simon Tran
e28b190628
ADDED:
+ Objective Engine on top of building (intentionally not movable and has no rigid body)*
*Player must go close enough to objective to win the game for balance sake.
9 years ago
Simon Tran
2083dd9927
ADDED:
> Audio-source and PlayerSound script to Player 2
9 years ago
Joshua Reason
27d2065056
fixed magnet sounds + put sounds script on player2
9 years ago
Joshua Reason
44e5aa686c
- fixed ground check in play sounds
9 years ago
Simon Tran
64b54c8ffa
Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker
9 years ago
Simon Tran
f215520aa8
ADDED:
+ All possible movement sounds (incl. jump & land)
9 years ago
Joshua Reason
db9615b169
particles on magnet turn on and off
9 years ago
Joshua Reason
5bfe2726fc
+terrain check when playing footstep sounds
9 years ago
Simon Tran
7a6f6c6735
ADDED:
+ Anim-Clip-Duplicate: Walk, Side-walk, run
+ Footstep events for walk and run
9 years ago
Simon Tran
7d88ed3317
CHANGED:
> Minor height adjustments to terrain
> Magnet-sparks now children of staff_top objects
> 2nd tutorial sign reverted to include LT button
9 years ago
Simon Tran
c1b17b61c5
CHANGED:
> PlayerSound script (requires ground recognition)
9 years ago
Joshua Reason
e468c14365
-duplicated crane
9 years ago
Joshua Reason
1a06e9a8aa
+walking with rod-forward
9 years ago
Joshua Reason
9f153ce981
+pointing rod when picking up object
9 years ago
Joshua Reason
21fe28716b
added blend tree for strafing left and right
9 years ago
Joshua Reason
ef35bcc500
updated existing models and animations to new model and animations
9 years ago
Joshua Reason
7ed1070209
Reverted back to last working copy
9 years ago
Joshua Reason
48ad18aaa0
Revert "Fixed merge + turns off sparkles when rod inactive."
This reverts commit 0003065fc9
.
9 years ago
Joshua Reason
8067b72f26
Revert "fixed AABB bug"
This reverts commit f0c9c659ef
.
9 years ago
Joshua Reason
7885de25f3
Revert "Trying to fix AABB bug for player2"
This reverts commit 07a1f18d1b
.
9 years ago
Joshua Reason
07a1f18d1b
Trying to fix AABB bug for player2
9 years ago
Joshua Reason
f0c9c659ef
fixed AABB bug
9 years ago
Joshua Reason
0003065fc9
Fixed merge + turns off sparkles when rod inactive.
9 years ago
Joshua Reason
38896cb1c7
Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker
Conflicts:
unity_Project/Assets/_Scenes/MainLevel.unity
unity_Project/ProjectSettings/ProjectSettings.asset
unity_Project/ProjectSettings/ProjectVersion.txt
9 years ago
Joshua Reason
d460c79363
Character animator, + fixed lightning for player 2
9 years ago
Simon Tran
3ffb8df066
ADDED:
+ Particle: Objective aura
+ GUI Image: Follow-Active sprite
+ New tag: "sand" (for the terrain for recognizing sand ground***)
CHANGED:
> Few changes to PlayerSound script
NOTE***
> Still currently working on getting different-ground sound script to work.
9 years ago
Simon Tran
0644362f8d
ADDED:
+ Particle: Magnet Sparks
+ Texture: Cargo Container (Metal) (for the crane)
9 years ago
Lachlan
306ca6dab9
Split Animations
9 years ago
Lachlan
ff178bddd2
New Animations
9 years ago
Simon Tran
a15fb0edb1
ADDED:
+ Updated Character textures (requires updated character FBX with proper UV)
+ Textures: Car trailer & engine
+ Object: Car Trailer (modified their UVs for easier texturing)
+ Shader: Laser PUSH (unused for now)
CHANGES:
> Created child objects for "Laser Holder PULL" for testing two-line and multiple-line line renderer.
KNOWN ISSUES:
> Using 3 or more line renderers significantly reduces frame rate. Please don't use multiple line renderers unless
it can be optimized.
9 years ago