gjcampbell/Magical-Jumping-Bean
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: gjcampbell/Magical-Jumping-Bean:crawl_slide_button
Branches Tags
gjcampbell/Magical-Jumping-Bean:master gjcampbell/Magical-Jumping-Bean:menus gjcampbell/Magical-Jumping-Bean:waypoint_race gjcampbell/Magical-Jumping-Bean:fleshing_out_obstacle_list gjcampbell/Magical-Jumping-Bean:obstacle_course_expansion gjcampbell/Magical-Jumping-Bean:Switch_input_manager_to_work_with_xbox_controllers gjcampbell/Magical-Jumping-Bean:doorway_to_new_scene gjcampbell/Magical-Jumping-Bean:procedural_level_generation gjcampbell/Magical-Jumping-Bean:update_controller_settings gjcampbell/Magical-Jumping-Bean:long_jump_and_slide_transition gjcampbell/Magical-Jumping-Bean:acceleration_rework gjcampbell/Magical-Jumping-Bean:wall_running gjcampbell/Magical-Jumping-Bean:add_momentum_to_movement gjcampbell/Magical-Jumping-Bean:fix_delayed_standing_slide_bug gjcampbell/Magical-Jumping-Bean:revert-13-expand_test_area gjcampbell/Magical-Jumping-Bean:expand_test_area gjcampbell/Magical-Jumping-Bean:crawl_slide_button gjcampbell/Magical-Jumping-Bean:rework_jump_counter gjcampbell/Magical-Jumping-Bean:rigidbody_controller gjcampbell/Magical-Jumping-Bean:player_capsule_faces_movement_direction gjcampbell/Magical-Jumping-Bean:directional_rotation gjcampbell/Magical-Jumping-Bean:free_rotating_camera gjcampbell/Magical-Jumping-Bean:player_rotation gjcampbell/Magical-Jumping-Bean:walk_button gjcampbell/Magical-Jumping-Bean:revert-3-walk_button gjcampbell/Magical-Jumping-Bean:updated_git_ignore gjcampbell/Magical-Jumping-Bean:git_ignore_file
...
pull from: gjcampbell/Magical-Jumping-Bean:revert-13-expand_test_area
Branches Tags
gjcampbell/Magical-Jumping-Bean:master gjcampbell/Magical-Jumping-Bean:menus gjcampbell/Magical-Jumping-Bean:waypoint_race gjcampbell/Magical-Jumping-Bean:fleshing_out_obstacle_list gjcampbell/Magical-Jumping-Bean:obstacle_course_expansion gjcampbell/Magical-Jumping-Bean:Switch_input_manager_to_work_with_xbox_controllers gjcampbell/Magical-Jumping-Bean:doorway_to_new_scene gjcampbell/Magical-Jumping-Bean:procedural_level_generation gjcampbell/Magical-Jumping-Bean:update_controller_settings gjcampbell/Magical-Jumping-Bean:long_jump_and_slide_transition gjcampbell/Magical-Jumping-Bean:acceleration_rework gjcampbell/Magical-Jumping-Bean:wall_running gjcampbell/Magical-Jumping-Bean:add_momentum_to_movement gjcampbell/Magical-Jumping-Bean:fix_delayed_standing_slide_bug gjcampbell/Magical-Jumping-Bean:revert-13-expand_test_area gjcampbell/Magical-Jumping-Bean:expand_test_area gjcampbell/Magical-Jumping-Bean:crawl_slide_button gjcampbell/Magical-Jumping-Bean:rework_jump_counter gjcampbell/Magical-Jumping-Bean:rigidbody_controller gjcampbell/Magical-Jumping-Bean:player_capsule_faces_movement_direction gjcampbell/Magical-Jumping-Bean:directional_rotation gjcampbell/Magical-Jumping-Bean:free_rotating_camera gjcampbell/Magical-Jumping-Bean:player_rotation gjcampbell/Magical-Jumping-Bean:walk_button gjcampbell/Magical-Jumping-Bean:revert-3-walk_button gjcampbell/Magical-Jumping-Bean:updated_git_ignore gjcampbell/Magical-Jumping-Bean:git_ignore_file
8 Commits
crawl_slide_button ... revert-13-expand_test_area
Author SHA1 Message Date
Gregory CampbellandGitHub d84d484f8f Revert "Expand test area" 2019-12-07 15:33:13 -05:00
Gregory CampbellandGitHub 7dfaa0e4df Merge pull request #13 from gjcampbell777/expand_test_area 
Expand test area
 2019-12-07 15:25:00 -05:00
Gregory CampbellandGitHub a6c845e6bf Merge branch 'master' into expand_test_area 2019-12-07 15:24:48 -05:00
Gregory Campbell d8608b3d1e Renamed Test Scene so it may be easier to merge 2019-12-07 13:31:17 -05:00
Gregory Campbell 9de4193758 Added more crawling/sliding obstacles and updated unity version 2019-12-07 13:21:24 -05:00
Gregory Campbell 416f976587 Added new obstacles and platforms as well as a new material for prototyping 2019-12-07 00:37:06 -05:00
Gregory CampbellandGitHub 28bcba0680 Merge pull request #12 from gjcampbell777/crawl_slide_button 
Crawl slide button
 2019-12-06 22:36:03 -05:00
Gregory Campbell 1b3bf960e4 Initial push. Floating stationary platforms added. 2019-10-02 20:43:13 -04:00
Expand all files Collapse all files

Diff Content Not Available