Skip to content
Permalink
Branch: master
Commits on Oct 10, 2013
  1. Final Build

    lan11001 committed Oct 10, 2013
    -Its done!
  2. Thursday Update

    lan11001 committed Oct 10, 2013
    -Fixed Hero hurt sound
    -Fixed ranged enemy attack
  3. Force Push

    lan11001 committed Oct 10, 2013
  4. Enviorment Update

    lan11001 committed Oct 10, 2013
    -Added new trees
    -Added new buildings
  5. Silverkeep Version 1.0

    lan11001 committed Oct 10, 2013
    -Is now playable
  6. Attack animations

    lan11001 committed Oct 10, 2013
    Attached Hero attacks
    Fixed Scenes
    Fixed Master Baddie code
  7. Day Night change

    lan11001 committed Oct 10, 2013
  8. Skybox Update!

    lan11001 committed Oct 10, 2013
  9. New master IGNORE ALL OTHERS

    lan11001 committed Oct 10, 2013
Commits on Oct 9, 2013
  1. updated hero prefab with master control

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
  2. Fire texture

    lan11001 committed Oct 9, 2013
    -Added fire texture
  3. Building Update

    lan11001 committed Oct 9, 2013
    -Added better houses
    -Added temple start room
    -Added more textures
  4. Wood textures!

    lan11001 committed Oct 9, 2013
    -Added Wood texture
  5. Added generator speedup based on scores(currently it gives a speedup …

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
    …signal at 70% victory score)
    
    Gotta get some shuteye, I will add music tonight with the help of john, and will help finish the final scene and add the skybox swap(just one line) as well.
  6. Updated all enemy prefab, they all face the correction when moving now

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
    fixed a bug that caused game over scene not triggering
    removed all unwanted colliders in animation
  7. Finally solved the facing update puzzle, monsters now will face the c…

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
    …orrect direction relatively.
    
    uploading before apply to all enemy
  8. Melee Attack animation added(bear claw thingy)

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
  9. I finally found the function I need to call child correctly, facing a…

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
    …nimation calls stage 1 complete, no more jumpy baddies.
  10. Linked John's scene with my test scene"LVL1", finished setting win/lo…

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
    …se condition
    
    win = score 15 (changeable on FPS_Hero script)
    lose= health reaches 0
    
    now working on fixing those buggy prefabs, found more incorrect body parts on prefabs, check with email please
    and also pull before power push
  11. finished build setting for john's work and hooked my test scene "LVL1…

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
    …" with it, working on win/lose condition
  12. merged with john's work, build setting lost, rebuilding and merging w…

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
    …ith my test scene.
    
    PULL before next PUSH plz
  13. recovered my lost lvl..

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
  14. pulled stuff and solved conflict

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
  15. recovered lost scripts

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
Commits on Oct 8, 2013
  1. Bear attack

    lan11001 committed Oct 8, 2013
    -Added Polarbear attack under prefab, with animation.
  2. Tree Prune Update

    lan11001 committed Oct 8, 2013
    -Removed trees, put into tree master prefab for later use. Was casuing fps issues.
    -Changed some lighting.
  3. test push

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 8, 2013
  4. Merge branch 'master' of git@github.uconn.edu:GameDev/Silverkeep.git

    lan11001 committed Oct 8, 2013
    Conflicts:
    	Guardian of Silverkeep/Assets/Prefab Flipped/water_baddie_front.prefab
    	Guardian of Silverkeep/Assets/Scene/LVL1.unity
  5. Water baddie 1.1 scale

    lan11001 committed Oct 8, 2013
    -Changed scale of water baddie to 1.1 in y
  6. accepted merging

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 8, 2013
  7. Water baddie fix

    lan11001 committed Oct 8, 2013
    -Fixed water baddie having tree in his caracter.
  8. before tree/water baddie fix push

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 8, 2013
  9. this is weird

    Tianzhu Zhang Tianzhu Zhang
    Tianzhu Zhang authored and Tianzhu Zhang committed Oct 8, 2013
Older
You can’t perform that action at this time.