Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
ed41804
alpha stuff
fogleman Jan 12, 2014
3342670
Merge branch 'master' into alpha
fogleman Jan 20, 2014
90f0626
merge deps
Feb 17, 2021
9f4388d
Create UserStories file and add stories 001-003
Feb 19, 2021
b8a60cf
Update UserStories
DakotaJ307 Feb 19, 2021
b44eb2e
Merge pull request #1 from DavidLandes/NathanJohns307-patch-1
Feb 19, 2021
dfc774d
Update UserStories
DakotaJ307 Feb 19, 2021
f314ba5
Merge pull request #2 from DavidLandes/NathanJohns307-patch-2
Feb 19, 2021
66b1907
Create backlog & add Tasks 001-004
Feb 19, 2021
e4c272e
Merge pull request #3 from DavidLandes/DavidLandes-create-backlog
DakotaJ307 Feb 19, 2021
b8d4281
Update Backlog
DakotaJ307 Feb 19, 2021
a4b524b
Merge pull request #4 from DavidLandes/NathanJohns307-patch-3
DakotaJ307 Feb 19, 2021
64d3bc3
Add documentation support with doxygen.
Feb 24, 2021
5a4540b
Merge pull request #5 from DavidLandes/dl-documentation
DakotaJ307 Feb 24, 2021
49942a0
Added lava/rain textures and mapped them to blocks placeable by player
DakotaJ307 Mar 7, 2021
aad049b
Merge pull request #6 from DavidLandes/tasks7and9
Mar 7, 2021
ebdae21
Variable mouse sensitivity
Mar 8, 2021
9db5119
Merge pull request #7 from DavidLandes/Controllable_mouse_sensitivity
Mar 8, 2021
b0d2c13
Added user stories and updated backlog
Bradley-Jackson Mar 12, 2021
48ffee6
Merge pull request #9 from DavidLandes/backlog_and_stories
DakotaJ307 Mar 12, 2021
15aeb64
commit generated doxy files
Mar 19, 2021
6fcc0c8
make water blocks visible & not obstacles
Mar 19, 2021
32a6799
Add is slowing property to items
Mar 19, 2021
89e68be
Slow player speed when intersecting slowing blocks
Mar 19, 2021
e0f6aa5
Add new tasks
Mar 26, 2021
ba29ac3
Merge pull request #12 from DavidLandes/dl-new-tasks
Mar 26, 2021
8aaa359
Merge pull request #10 from DavidLandes/12-water-invisible
Bradley-Jackson Mar 26, 2021
3c062fd
Merge pull request #11 from DavidLandes/13-slow-movement-in-water-lava
Bradley-Jackson Mar 26, 2021
a4030ec
rain drop blocks now spawn one block below clouds
DakotaJ307 Mar 26, 2021
324fd5e
rain and lava now have no collision
DakotaJ307 Mar 26, 2021
9011f4c
Merge branch 'develop' into tasks-10-11-14
Mar 26, 2021
a7f52f6
Merge pull request #13 from DavidLandes/tasks-10-11-14
Mar 26, 2021
6d3eecc
update assigned and completed tasks.
Mar 26, 2021
b896087
Merge pull request #14 from DavidLandes/dl-sprint-update
Mar 26, 2021
86997fd
Give players a health value
Apr 2, 2021
6c18bf6
Display player health value.
Apr 2, 2021
ea3f9c0
Respawn player if health reaches 0
Apr 2, 2021
1caf80e
take fall damage based on velocity of collision.
Apr 2, 2021
7ea4907
Increase fall damage
Apr 2, 2021
e3f21b9
Take gradual damage while in lava
Apr 2, 2021
265137c
Mark tasks completed.
Apr 2, 2021
4478000
resolved merge conflict between task 18 and 15
Bradley-Jackson Apr 3, 2021
9a81e18
lowered sprint multiplier
Bradley-Jackson Apr 3, 2021
9c30e9d
Merge pull request #17 from DavidLandes/resolved_merge_conflict
Apr 3, 2021
9cfcc01
heals the player a small amount every frame
Bradley-Jackson Apr 8, 2021
a95ecfd
Update Backlog
Bradley-Jackson Apr 8, 2021
571cc70
used macro instead of hard coding
Bradley-Jackson Apr 8, 2021
5717be4
Merge pull request #18 from DavidLandes/Bradley-Jackson-patch-1
Apr 8, 2021
edeb8a0
Merge pull request #19 from DavidLandes/periodic_healing
Apr 8, 2021
11ff8f4
Update UserStories
Bradley-Jackson Apr 9, 2021
59eaab5
Merge pull request #20 from DavidLandes/Bradley-Jackson-patch-2
Apr 9, 2021
84a27ef
Update UserStories
Bradley-Jackson Apr 9, 2021
44a074b
Merge pull request #21 from DavidLandes/Bradley-Jackson-patch-3
Apr 9, 2021
a866145
Update Backlog
Bradley-Jackson Apr 9, 2021
c8cc281
Merge pull request #22 from DavidLandes/Bradley-Jackson-patch-3-1
Apr 9, 2021
15cbdaa
Update backlog tasks
Apr 9, 2021
2834252
Add new task
Apr 9, 2021
6802d8c
Merge pull request #23 from DavidLandes/dl-update-tasks
Bradley-Jackson Apr 9, 2021
338a3df
Re-organize documentation. Include source code.
Apr 15, 2021
e4b518e
documentation.html in parent folder that points to index.html generat…
Bradley-Jackson Apr 21, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"files.associations": {
"cube.h": "c"
},
"cmake.configureOnOpen": true
}
26 changes: 26 additions & 0 deletions Backlog
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--COMPLETE-- US001 Task001 - Modify mouse input to move the player's view less. The mouse should be less sensitive. Points 3
US002 Task002 - Sand blocks should fall to the ground if there is no block underneath. Points 5
US002 Task003 - Gravel blocks should fall to the ground if there is no block underneath. Points 5
--COMPLETE-- US003 Task004 - Cloud color should change to a dark grey at night, and stay white during daytime. Points 2
US004 Task005 - Design the layout and structure of the buildings to be spawned. Points 5
US004 Task006 - Create generation function and spawn conditions for buildings. Points 5
--COMPLETE-- US005 Task007 - Create lava block model. Points 3
--ASSIGNED-- US005 Task008 - Create generation function and spawn conditions for lava pools. Points 5
--COMPLETE-- US006 Task009 - Create rain drop block model. Points 3
--COMPLETE-- US006 Task010 - Create spawn conditions for rain drop blocks. Points 3
US006 Task011 - Rain drop blocks should have no collision and be effected by gravity. Points 3
--COMPLETE-- US007 Task012 - Water blocks should not be transparent. Points 2
--COMPLETE-- US007 Task013 - Water and lava blocks should slow player movement when the player is inside them. Points 3
--COMPLETE-- US007 Task014 - Lava blocks should have no collision. Points 1
--COMPLETE-- US008 Task015 - Add button handling for sprint, doubling movement speed. Points 3
--COMPLETE-- US009 Task016 - Add the ability to double jump while not flying. Points 3
--COMPLETE-- US010 Task017 - Add bodies of water to terrain generation. Points 5
--COMPLETE-- US011 Task018 - Give players a health value. points 2
--COMPLETE-- US011 Task019 - Subtract from the player's health value while in lava or if the player falls from 5 blocks or higher. points 5
--COMPLETE-- US011 Task020 - Add to the player's health periodically if it is not full. points 4
--ASSIGNED-- US012 Task021 - Hold the space key to float to the top of a water body. points 3
--ASSIGNED-- US013 Task022 - Document the main.c functions handle_movement, tree, on_mouse_button, heal_damage, and create_window. points 2
--ASSIGNED-- US014 Task023 - Create overlay when paused that displays the controls. points 3
--ASSIGNED-- US001 Task024 - Make mouse more responsive to input, and reduce spinning when looking straight up or down. points 4
--ASSIGNED-- US013 Task025 - Document the main.c functions: handle_player_health, handle_lava_damage, handle_fall_damage, is_movement_slowed, and reset_model. points 2
--ASSIGNED-- US014 Task026 - Re-map the zoom key from left-shift to 'z'. points 2
15 changes: 15 additions & 0 deletions UserStories
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
US001 - As a player of Craft, the mouse control should be less sensitive to movement so the game is more user friendly.
US002 - As a player of Craft, certain blocks should be affected by gravity to make the game have a more realistic environment.
US003 - As a player of Craft, the cloud's shading should reflect the time of day in the game to create a more realistic environment.
US004 - As a player of Craft, I want randomly spawning buildings or structures to create a more diverse playing environment.
US005 - As a player of Craft, I want randomly generated lava pools to create a more diverse playing environment.
US006 - As a player of Craft, I want periodic weather (rain) so that the environment is more dynamic and realistic.
US007 - As a player of Craft, I want fluid blocks to slow player movement.
US008 - As a player of Craft, I want to be able to sprint.
US009 - As a player of Craft, I want to be able to double jump
US010 - As a player of Craft, I want bodies of water to be generated in the map.
US011 - As a player of Craft, I want the player to have limited, regenerating health, to make a more realistic environment.
US012 - As a player of Craft, I want to be able to swim wherever there are water blocks, to make the game more realistic.
US013 - As a developer of Craft, I want to have better documented and understandable code to increase readability.
US014 - As a player of Craft, I want to be able to view the controls of the game when I pause.
US015 - As a player of Craft, I want the game controls to be more intuitive to create a smoother transition from another game to Craft.
1 change: 1 addition & 0 deletions build/.cmake/api/v1/query/client-vscode/query.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"codemodel","version":2}]}
Loading