Commit Graph

Select branches

Hide Pull Requests

Switch_input_manager_to_work_with_xbox_controllers

acceleration_rework

add_momentum_to_movement

crawl_slide_button

directional_rotation

doorway_to_new_scene

expand_test_area

fix_delayed_standing_slide_bug

fleshing_out_obstacle_list

free_rotating_camera

git_ignore_file

long_jump_and_slide_transition

master

menus

obstacle_course_expansion

player_capsule_faces_movement_direction

player_rotation

procedural_level_generation

revert-13-expand_test_area

revert-3-walk_button

rework_jump_counter

rigidbody_controller

update_controller_settings

updated_git_ignore

walk_button

wall_running

waypoint_race

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#3

#4

#5

#6

#7

#8

#9

Mono Color

• c15593f6b1 Fixed infinite sliding issue Gregory Campbell 2020-01-15 18:44:22 -05:00
• 3268b00727 Fixed translucent material bug Gregory Campbell 2020-01-15 18:15:33 -05:00
• c5f8acad40 Scene lighting fix Gregory Campbell 2020-01-15 18:02:40 -05:00
• 5f5d9b2052 Missing change that I forgot to add in Gregory Campbell 2020-01-15 17:48:56 -05:00
• b25687ac7f Merge pull request #26 from gjcampbell777/waypoint_race Gregory CampbellandGitHub 2020-01-14 22:02:14 -05:00
• 11d9698aad Aside from one issue with the waypoint the waypoint race scene is working as intended waypoint_race Gregory Campbell 2020-01-14 22:01:39 -05:00
• 9e71153754 Merge pull request #25 from gjcampbell777/fleshing_out_obstacle_list Gregory CampbellandGitHub 2020-01-13 22:11:31 -05:00
• c93cb07b59 Added a buttload of obstacles along with many mods tothe floor level script to help with balancing, merge this branch for now but some serious balancing needs to be implemented eventually fleshing_out_obstacle_list Gregory Campbell 2020-01-13 22:10:50 -05:00
• eb821f097e Merge pull request #24 from gjcampbell777/obstacle_course_expansion Gregory CampbellandGitHub 2020-01-12 22:49:10 -05:00
• 3f856967a7 Reworked the obstacle course script so that floor squares can not appear as well as adding a level counter that determines when you will move to a bigger obstacle course. Also fixed a big floor building issue that wasn't noticable until adding these features obstacle_course_expansion Gregory Campbell 2020-01-12 22:48:35 -05:00
• b88a3b978b Merge pull request #23 from gjcampbell777/Switch_input_manager_to_work_with_xbox_controllers Gregory CampbellandGitHub 2020-01-12 18:27:46 -05:00
• fe0ac70b48 Switched from ps4 functionality to xbox one functionality Switch_input_manager_to_work_with_xbox_controllers Gregory Campbell 2020-01-12 18:26:38 -05:00
• 12ac3e2fce Missed material file Gregory Campbell 2020-01-12 18:02:17 -05:00
• 825a64fa81 Merge pull request #22 from gjcampbell777/doorway_to_new_scene Gregory CampbellandGitHub 2020-01-11 15:56:14 -05:00
• 31b81f08b9 Implemented all needed to get a portal working to floor level as well as setting up portals for future game modes doorway_to_new_scene Gregory Campbell 2020-01-11 15:55:01 -05:00
• 2b6eb87127 Merge pull request #21 from gjcampbell777/procedural_level_generation Gregory CampbellandGitHub 2020-01-11 14:16:59 -05:00
• c6c387760f Cleaned up some respawn variable changes on hub world to prevent future bugs procedural_level_generation Gregory Campbell 2020-01-11 14:15:38 -05:00
• 24c16b9e8a Renmed script since this script will only be used for the floor level scene Gregory Campbell 2020-01-11 14:10:44 -05:00
• 05632bf0b7 Adding respawning and a lives count. Once lives count reaches zero you are kicked back to hub world. Hub world also has respawning Gregory Campbell 2020-01-11 14:04:14 -05:00
• 406a39655d Figured out solution to respawning bug Gregory Campbell 2020-01-11 13:35:50 -05:00
• 15521e4a4c Added the resetting of a level after player reaches the end, encountered strange bug that causes player to not teleport back to start Gregory Campbell 2020-01-11 00:46:40 -05:00
• e801bfe945 Moved the procedural generation over into a new scene in order to develop the first game mode - spawning into the next 'floor' is currently buggy Gregory Campbell 2020-01-10 00:26:44 -05:00
• e21c46f941 Adding new 'basic' floor prefab as well as including it in the obstacle list array Gregory Campbell 2020-01-07 21:55:49 -05:00
• f8edbd7ae3 A proper and functional procedural level generation has been implemented although it is missing many more obstacles as well as its own scene to be generated (and re-generated upon completion) in Gregory Campbell 2020-01-07 21:52:52 -05:00
• 9d94f117c4 Merge pull request #20 from gjcampbell777/update_controller_settings Gregory CampbellandGitHub 2020-01-05 17:07:59 -05:00
• 93307022e4 PS4 controller input working (but camera doesn't work without steam) update_controller_settings Gregory Campbell 2020-01-05 17:02:15 -05:00
• a557887275 Implemented a universal input for PS4 and KBM as well as fixing a few movement bugs Gregory Campbell 2020-01-05 15:57:18 -05:00
• b9cfa34614 Merge pull request #19 from gjcampbell777/long_jump_and_slide_transition Gregory CampbellandGitHub 2020-01-05 14:43:12 -05:00
• e6db8a979c Cleaned up the expanded area and gave all obstacles more space between each other as well as fine tuning and fixing all noticeable issuses with all crouch based movements long_jump_and_slide_transition Gregory Campbell 2020-01-05 12:56:23 -05:00
• d4fafd63d3 Implemented a long jump, a dive, the ability to bunny hop and a somewhat messy fix to the straight down drop issue from the implemented gravity as well as expanding the test area to more easily test quick movements Gregory Campbell 2020-01-05 01:45:45 -05:00
• 081d93f2c2 Merge pull request #18 from gjcampbell777/acceleration_rework Gregory CampbellandGitHub 2020-01-04 16:15:56 -05:00
• 996e1e3b20 Fully functional and satisfactory acc/decc in movement (although a little slippery, might require more tweakign later on) acceleration_rework Gregory Campbell 2020-01-04 16:15:15 -05:00
• 386b51589e Got a fully functional implementation of acceleration/decceleration that meshes well across all inputs. Will do further testing/tinkering before merging Gregory Campbell 2020-01-04 15:52:45 -05:00
• 573b4815ea Havent made any real progress, stopping and saving this now to work on other things Gregory Campbell 2020-01-04 15:02:05 -05:00
• db8ae256a8 Merge pull request #17 from gjcampbell777/wall_running Gregory CampbellandGitHub 2019-12-31 18:18:34 -05:00
• 9818b32bdc Got a functional implementation of wall running that I am satisfied with wall_running Gregory Campbell 2019-12-31 18:17:35 -05:00
• f1db804155 Implemented basic wallrunning Gregory Campbell 2019-12-21 23:17:24 -05:00
• a31a335424 Merge pull request #16 from gjcampbell777/add_momentum_to_movement Gregory CampbellandGitHub 2019-12-21 21:03:56 -05:00
• e638892592 Got momentum based movement fully functional while fixing a few player controller bugs and preferential tweaks add_momentum_to_movement Gregory Campbell 2019-12-21 21:00:36 -05:00
• 3afdbc4ff0 Fixed issue causing no increased or decreased mmovement based on changing moveset Gregory Campbell 2019-12-14 23:49:23 -05:00
• a292dd8b9a Added momentum to player movement and made adjustments to public player variables Gregory Campbell 2019-12-14 23:40:14 -05:00
• 31fc08bd5b Slight tweak to improve upon the last merge Gregory Campbell 2019-12-11 21:33:57 -05:00
• b83c37531a Merge pull request #15 from gjcampbell777/fix_delayed_standing_slide_bug Gregory CampbellandGitHub 2019-12-11 21:14:01 -05:00
• de4da48e05 Fixed delayed standing slide and made standard horz/vert axis movement uniform across keyboard and joystick fix_delayed_standing_slide_bug Gregory Campbell 2019-12-11 21:12:47 -05:00
• e616fa50b2 Better Builds implementation for .gitignore Gregory Campbell 2019-12-07 16:10:09 -05:00
• 67601fdc7d Updated gitignore to ignore Mac Builds Gregory Campbell 2019-12-07 16:07:19 -05:00
• fb0b50645b Changes for deploying builds Gregory Campbell 2019-12-07 16:05:46 -05:00
• 9c74c88b46 Merging all expand_test_area changes through master since trying to merge that branch while removing what is out of date is too much of a pain to deal with Gregory Campbell 2019-12-07 15:47:13 -05:00
• a102dea709 Merge pull request #14 from gjcampbell777/revert-13-expand_test_area Gregory CampbellandGitHub 2019-12-07 15:33:24 -05:00
• d84d484f8f Revert "Expand test area" revert-13-expand_test_area Gregory CampbellandGitHub 2019-12-07 15:33:13 -05:00
• 7dfaa0e4df Merge pull request #13 from gjcampbell777/expand_test_area Gregory CampbellandGitHub 2019-12-07 15:25:00 -05:00
• a6c845e6bf Merge branch 'master' into expand_test_area expand_test_area Gregory CampbellandGitHub 2019-12-07 15:24:48 -05:00
• d8608b3d1e Renamed Test Scene so it may be easier to merge Gregory Campbell 2019-12-07 13:31:17 -05:00
• 9de4193758 Added more crawling/sliding obstacles and updated unity version Gregory Campbell 2019-12-07 13:21:24 -05:00
• 416f976587 Added new obstacles and platforms as well as a new material for prototyping Gregory Campbell 2019-12-07 00:37:06 -05:00
• 28bcba0680 Merge pull request #12 from gjcampbell777/crawl_slide_button Gregory CampbellandGitHub 2019-12-06 22:36:03 -05:00
• 645395a43c Added implementation so that crawling in differentiated from sliding through current player movement crawl_slide_button Gregory Campbell 2019-12-06 22:34:57 -05:00
• ba63ebf72b Added sliding which reverts back to crouching/crawling after 1 second Gregory Campbell 2019-12-05 23:17:24 -05:00
• 9c10ca695d Crouching/crawling functionality is working Gregory Campbell 2019-12-05 22:42:16 -05:00
• c13613ca25 Merge pull request #11 from gjcampbell777/rework_jump_counter Gregory CampbellandGitHub 2019-12-05 21:58:53 -05:00
• 2ade04fcba Cleaned up jumping and double jumping implementation rework_jump_counter Gregory Campbell 2019-12-05 21:57:29 -05:00
• 706ad21ed1 Replaced character controller with rigidbody and fixed all player controller script errors - player character can only spin in place rigidbody_controller Gregory Campbell 2019-12-01 18:28:18 -05:00
• 6c112d7784 Updated Unity version and updated asset packages to avoid deprecation Gregory Campbell 2019-12-01 16:15:44 -05:00
• b4f80a4cf1 Merge pull request #10 from gjcampbell777/player_capsule_faces_movement_direction Gregory CampbellandGitHub 2019-11-24 17:55:15 -05:00
• c88ef3ac24 Changed which object rotates when player faces directions and added new texture/material so player front and back are more clear player_capsule_faces_movement_direction Gregory Campbell 2019-11-24 17:53:48 -05:00
• dcdda5d586 Updated Unity version Gregory Campbell 2019-11-24 17:27:29 -05:00
• 2d5ce21ea7 Created, Added and Applied a basic texture that helps show which way the player chracter is facing Gregory Campbell 2019-11-17 20:30:33 -05:00
• a213f1ed56 Merge pull request #9 from gjcampbell777/directional_rotation Gregory CampbellandGitHub 2019-11-17 20:18:10 -05:00
• 4c04f3d802 Made character direction change more smooth and less binary directional_rotation Gregory Campbell 2019-11-17 20:17:16 -05:00
• 8f6ff0b698 Merge pull request #8 from gjcampbell777/directional_rotation Gregory CampbellandGitHub 2019-11-10 21:07:29 -05:00
• a0d01964c7 Merge branch 'directional_rotation' of github.com:gjcampbell777/3DSpeedPlatformer into directional_rotation Gregory Campbell 2019-11-10 21:06:21 -05:00
• b696d526d5 Player moves based on where the camera is pointing and faces the direction in which it is moving Gregory Campbell 2019-11-10 21:04:52 -05:00
• b6ad41aa53 Character faces direction but then input moves character relative to the position character is facing Gregory Campbell 2019-10-13 12:56:56 -04:00
• d50f3f315e Merge pull request #7 from gjcampbell777/free_rotating_camera Gregory CampbellandGitHub 2019-11-10 20:39:26 -05:00
• e99156177b Commented out the reset camera button since that functionality may be useless in the long run free_rotating_camera Gregory Campbell 2019-11-10 20:37:51 -05:00
• 8c48b3bdbb Updated project version and scene Gregory Campbell 2019-11-10 19:33:17 -05:00
• 8891b70641 Implemented static y axis rotation when reset button is pressed Gregory Campbell 2019-10-17 23:40:37 -04:00
• d8e0b5fa80 Implemented free roam camera. Working on a button which resets camera location. Gregory Campbell 2019-10-13 14:02:58 -04:00
• 71667543b7 Character faces direction but then input moves character relative to the position character is facing Gregory Campbell 2019-10-13 12:56:56 -04:00
• e104e71bba Updated Unity Version Gregory Campbell 2019-10-13 12:30:41 -04:00
• bb50976229 Inital push. Potential start to a camera that can 360 rotate around the player Gregory Campbell 2019-10-06 20:45:57 -04:00
• a38633b581 Merge pull request #6 from gjcampbell777/player_rotation Gregory CampbellandGitHub 2019-10-06 20:32:33 -04:00
• 0a2e22e637 Added simple player rotation player_rotation Gregory Campbell 2019-10-06 20:31:13 -04:00
• 650830926c Updated manifest Gregory Campbell 2019-10-06 20:28:53 -04:00
• 0adfed4c40 Updated Unity version Gregory Campbell 2019-10-06 20:28:19 -04:00
• 1b3bf960e4 Initial push. Floating stationary platforms added. Gregory Campbell 2019-10-02 20:43:13 -04:00
• 4a40559ff8 Update Unity Version Gregory Campbell 2019-10-02 20:31:07 -04:00
• cffbbf3b0f fixed untracked files Gregory Campbell 2019-09-30 21:43:00 -04:00
• 18517d09b5 Merge pull request #5 from gjcampbell777/walk_button Gregory CampbellandGitHub 2019-09-30 21:31:44 -04:00
• eb8713b28d Merge branch 'master' into walk_button walk_button Gregory CampbellandGitHub 2019-09-30 21:31:20 -04:00
• 4c52fc32db Initial Push. Implemented clean basic walk button Gregory Campbell 2019-09-30 21:29:43 -04:00
• 7894befefa Merge pull request #4 from gjcampbell777/revert-3-walk_button Gregory CampbellandGitHub 2019-09-30 21:25:49 -04:00
• 5ceef5963f Revert "Initial push. Implemented basic walk button" revert-3-walk_button Gregory CampbellandGitHub 2019-09-30 21:25:33 -04:00
• c75ddb2a14 Merge pull request #3 from gjcampbell777/walk_button Gregory CampbellandGitHub 2019-09-30 21:18:56 -04:00
• 0ed1912a0c Merge pull request #2 from gjcampbell777/updated_git_ignore Gregory CampbellandGitHub 2019-09-30 21:18:35 -04:00
• d7ecb9257c Initial push. Implemented githubs recommnded unity gitignore file updated_git_ignore Gregory Campbell 2019-09-30 21:17:47 -04:00
• b2fd9dc737 Initial push. Implemented basic walk button Gregory Campbell 2019-09-30 21:15:20 -04:00
• 1b5b99811e Merge pull request #1 from gjcampbell777/git_ignore_file Gregory CampbellandGitHub 2019-09-30 20:17:55 -04:00
• 1801d648b7 Initial push. Added gitignore git_ignore_file Gregory Campbell 2019-09-30 20:16:39 -04:00
• 558b97edff Create README.md Gregory CampbellandGitHub 2019-09-29 20:11:45 -04:00