Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolve issue 5 #309

Draft
wants to merge 87 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
8712058
Issue #16
Jun 20, 2023
6ca5a52
issue #4
Jun 20, 2023
4c29ec8
first pass including ground sprinting, need to include speed increases
TonePoems Jun 21, 2023
7441002
Requested Changes Made to #4
Jun 21, 2023
2c351ec
Requested changes made to README.md #4
Jun 21, 2023
12e80b9
resolve issue 5
Jun 27, 2023
e404498
add gtest to cmake process and readme
TonePoems Jul 1, 2023
9e65f85
new texture file
Jul 4, 2023
d818dd9
runTests executable works without testing main.c
TonePoems Jul 4, 2023
93e1b39
add testing section to explain how to add and run
TonePoems Jul 4, 2023
d0080c2
Merge pull request #24 from WSUCEG-7140/issue5
dburd08 Jul 5, 2023
582d420
Merge pull request #25 from WSUCEG-7140/9-basic-testing-suite
TonePoems Jul 5, 2023
28446e3
Merge branch 'master' of github.com:WSUCEG-7140/Craft into 6-upgraded…
TonePoems Jul 5, 2023
13c1239
Merge pull request #22 from WSUCEG-7140/#4
Jul 11, 2023
5151507
Merge pull request #21 from WSUCEG-7140/#16
Jul 11, 2023
f3ba8be
updated readme testing commands
Jul 11, 2023
dafddf7
Merge branch 'master' of github.com:WSUCEG-7140/Craft
Jul 11, 2023
5389535
resolve issue #2
Jul 12, 2023
0a34e90
modifiable flying speed settings
TonePoems Jul 15, 2023
3b1a61e
Merge branch 'master' into 6-upgraded-sprinting-for-flying
TonePoems Jul 16, 2023
2f8e538
update readme command reference
TonePoems Jul 16, 2023
f09a7f4
add command options for changing mouse sensitivity in game
TonePoems Jul 16, 2023
59a7581
evening checkpoint
TonePoems Jul 16, 2023
054987a
readme commands help menu created
TonePoems Jul 16, 2023
7a3e8b6
updates for MRs 6-flyspeed and 8-mouse
TonePoems Jul 16, 2023
57b8e7c
define debug parameter
Jul 17, 2023
c8d5f19
define player height
Jul 17, 2023
4de782a
Merge pull request #29 from WSUCEG-7140/8-setting-for-mouse-sensitivity
TonePoems Jul 17, 2023
744c087
Define structure variable
Jul 17, 2023
ad2d21a
Merge branch 'master' into 6-upgraded-sprinting-for-flying
TonePoems Jul 17, 2023
f8dd164
Merge pull request #28 from WSUCEG-7140/6-upgraded-sprinting-for-flying
TonePoems Jul 17, 2023
21d3dad
add height modification commands
Jul 17, 2023
9df55f6
configure height-collide
Jul 17, 2023
a70cea2
Merge branch 'master' of github.com:WSUCEG-7140/Craft into #13
Jul 17, 2023
039831e
Update README.md
Jul 17, 2023
7f2a63c
Revert "Resolved Issue #16"
Jul 17, 2023
41ce280
Merge pull request #38 from WSUCEG-7140/revert-21-#16
Jul 19, 2023
e2aedda
Merge pull request #30 from WSUCEG-7140/issue2
dburd08 Jul 19, 2023
23d667c
merge config file
Jul 19, 2023
23e40ba
Merge branch 'master' of github.com:WSUCEG-7140/Craft
Jul 19, 2023
f8742dd
Merge pull request #33 from WSUCEG-7140/7-in-game-controls-menu
TonePoems Jul 19, 2023
c02a537
Merge pull request #37 from WSUCEG-7140/#13
Jul 19, 2023
97f2274
literate programming req
TonePoems Jul 20, 2023
ef8e598
literate programming req
TonePoems Jul 20, 2023
e24ea1f
literate programming req
TonePoems Jul 20, 2023
9599693
Add Doxygen
Jul 20, 2023
b8062fa
reformat all comment syntax
Jul 20, 2023
5d3e2cd
add doxygen config file
Jul 20, 2023
d2d7a5f
issue #16
Jul 21, 2023
d53e203
Merge pull request #46 from WSUCEG-7140/34-testing-mouse-sensitivity
TonePoems Jul 21, 2023
779224e
Merge pull request #45 from WSUCEG-7140/35-testing-flying-speed
TonePoems Jul 21, 2023
103849f
Merge pull request #44 from WSUCEG-7140/36-testing-in-game-command-menu
TonePoems Jul 21, 2023
c33841d
Revert "Merge pull request #22 from WSUCEG-7140/#4"
Jul 21, 2023
4e80271
issue #4 Test
Jul 21, 2023
041c311
Merge branch 'master' of github.com:WSUCEG-7140/Craft
Jul 21, 2023
68c2d21
resolve issue #31
Jul 21, 2023
4a85f50
resolve issue #32
Jul 21, 2023
c387942
Merge pull request #50 from WSUCEG-7140/#16
Jul 22, 2023
0950b95
Merge branch 'master' into #18
Jul 22, 2023
e62b401
Merge pull request #48 from WSUCEG-7140/#18
Jul 22, 2023
019ceb7
Merge branch 'master' into revert-22-#4
Jul 22, 2023
940b29e
Merge pull request #51 from WSUCEG-7140/revert-22-#4
Jul 22, 2023
3853580
issue #4
Jul 22, 2023
edb153b
Revert "issue #4"
Jul 22, 2023
6a7f4c1
issue #4
Jul 22, 2023
70eafcd
Issue #17
Jul 25, 2023
6152b6a
Update README.md
Jul 25, 2023
fda2d6a
Merge pull request #52 from WSUCEG-7140/#4-Test
Jul 25, 2023
18cc388
Issue #13 Test
Jul 25, 2023
1462999
Issue #16 Test
Jul 25, 2023
55a1ec4
Issue #17 Test
Jul 25, 2023
c20d0c1
issue #15
Jul 25, 2023
df61dc2
issue #15 Test
Jul 25, 2023
9b8c9ad
Merge pull request #54 from WSUCEG-7140/issue32
dburd08 Jul 25, 2023
ddbc84a
Merge pull request #53 from WSUCEG-7140/issue31
dburd08 Jul 25, 2023
27ef56a
Merge pull request #56 from WSUCEG-7140/#4
Jul 25, 2023
ce1e590
Merge pull request #57 from WSUCEG-7140/#17
Jul 25, 2023
f95151a
Merge branch 'master' into #15
Jul 25, 2023
0bea8a6
Merge pull request #63 from WSUCEG-7140/#15
Jul 25, 2023
4755c0b
Merge pull request #60 from WSUCEG-7140/#13-Test
Jul 25, 2023
38757ff
Merge pull request #64 from WSUCEG-7140/#15-Test
Jul 25, 2023
538a48f
Merge pull request #61 from WSUCEG-7140/#16-Test
Jul 25, 2023
6c49cb0
Merge pull request #62 from WSUCEG-7140/#17-Test
Jul 25, 2023
3dc3b47
comments added for literate programming
Jul 26, 2023
c019a14
Merge branch 'master' into issue5
Jul 26, 2023
3c71cc9
merge master into feature branch
Jul 26, 2023
76aab06
merge clean up
Jul 26, 2023
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ log.txt
*.dll
*.pyc

deps/*
29 changes: 29 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,32 @@ if(MINGW)
target_link_libraries(craft ws2_32.lib glfw
${GLFW_LIBRARIES} ${CURL_LIBRARIES})
endif()

# GTest setup
# do not want main included so it is a valid executable
#MESSAGE(STATUS "${SOURCE_FILES}")
FOREACH(item ${SOURCE_FILES})
IF(${item} MATCHES "src/main.c")
LIST(REMOVE_ITEM SOURCE_FILES ${item})
ENDIF(${item} MATCHES "src/main.c")
ENDFOREACH(item)
#MESSAGE(STATUS "${SOURCE_FILES}")

enable_testing()
find_package(GTest REQUIRED)
include_directories(${GTEST_INCLUDE_DIR})
add_executable(
runTests
tests/tests.cpp
${SOURCE_FILES}
deps/glew/src/glew.c
deps/lodepng/lodepng.c
deps/noise/noise.c
deps/sqlite/sqlite3.c
deps/tinycthread/tinycthread.c)
target_link_libraries(runTests
${GTEST_BOTH_LIBRARIES}
pthread
dl glfw
${GLFW_LIBRARIES}
${CURL_LIBRARIES} )
2,815 changes: 2,815 additions & 0 deletions DoxyConfigfile

Large diffs are not rendered by default.

131 changes: 131 additions & 0 deletions Doxygen-Doc/html/annotated.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
<head>
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
<meta name="generator" content="Doxygen 1.9.7"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>Craft: Class List</title>
<link href="tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="navtree.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="resize.js"></script>
<script type="text/javascript" src="navtreedata.js"></script>
<script type="text/javascript" src="navtree.js"></script>
<link href="search/search.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="search/searchdata.js"></script>
<script type="text/javascript" src="search/search.js"></script>
<script type="text/javascript">
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
$(document).ready(function() { init_search(); });
/* @license-end */
</script>
<link href="doxygen.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
<div id="titlearea">
<table cellspacing="0" cellpadding="0">
<tbody>
<tr id="projectrow">
<td id="projectlogo"><img alt="Logo" src="minecraft-game copy.png"/></td>
<td id="projectalign">
<div id="projectname">Craft<span id="projectnumber">&#160;1.0</span>
</div>
<div id="projectbrief">Minecraft Project - Team Fogleman</div>
</td>
<td> <div id="MSearchBox" class="MSearchBoxInactive">
<span class="left">
<span id="MSearchSelect" onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
<input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
onfocus="searchBox.OnSearchFieldFocus(true)"
onblur="searchBox.OnSearchFieldFocus(false)"
onkeyup="searchBox.OnSearchFieldChange(event)"/>
</span><span class="right">
<a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.svg" alt=""/></a>
</span>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<!-- end header part -->
<!-- Generated by Doxygen 1.9.7 -->
<script type="text/javascript">
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
var searchBox = new SearchBox("searchBox", "search/",'.html');
/* @license-end */
</script>
</div><!-- top -->
<div id="side-nav" class="ui-resizable side-nav-resizable">
<div id="nav-tree">
<div id="nav-tree-contents">
<div id="nav-sync" class="sync"></div>
</div>
</div>
<div id="splitbar" style="-moz-user-select:none;"
class="ui-resizable-handle">
</div>
</div>
<script type="text/javascript">
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
$(document).ready(function(){initNavTree('annotated.html',''); initResizable(); });
/* @license-end */
</script>
<div id="doc-content">
<!-- window showing the filter options -->
<div id="MSearchSelectWindow"
onmouseover="return searchBox.OnSearchSelectShow()"
onmouseout="return searchBox.OnSearchSelectHide()"
onkeydown="return searchBox.OnSearchSelectKey(event)">
</div>

<!-- iframe showing the search results (closed by default) -->
<div id="MSearchResultsWindow">
<div id="MSearchResults">
<div class="SRPage">
<div id="SRIndex">
<div id="SRResults"></div>
<div class="SRStatus" id="Loading">Loading...</div>
<div class="SRStatus" id="Searching">Searching...</div>
<div class="SRStatus" id="NoMatches">No Matches</div>
</div>
</div>
</div>
</div>

<div class="header">
<div class="headertitle"><div class="title">Class List</div></div>
</div><!--header-->
<div class="contents">
<div class="textblock">Here are the classes, structs, unions and interfaces with brief descriptions:</div><div class="directory">
<table class="directory">
<tr id="row_0_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_attrib.html" target="_self">Attrib</a></td><td class="desc"></td></tr>
<tr id="row_1_" class="odd"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_block.html" target="_self">Block</a></td><td class="desc"></td></tr>
<tr id="row_2_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_chunk.html" target="_self">Chunk</a></td><td class="desc"></td></tr>
<tr id="row_3_" class="odd"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_f_p_s.html" target="_self">FPS</a></td><td class="desc"></td></tr>
<tr id="row_4_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_map.html" target="_self">Map</a></td><td class="desc"></td></tr>
<tr id="row_5_" class="odd"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="union_map_entry.html" target="_self">MapEntry</a></td><td class="desc"></td></tr>
<tr id="row_6_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_model.html" target="_self">Model</a></td><td class="desc"></td></tr>
<tr id="row_7_" class="odd"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_player.html" target="_self">Player</a></td><td class="desc"></td></tr>
<tr id="row_8_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_ring.html" target="_self">Ring</a></td><td class="desc"></td></tr>
<tr id="row_9_" class="odd"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_ring_entry.html" target="_self">RingEntry</a></td><td class="desc"></td></tr>
<tr id="row_10_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_sign.html" target="_self">Sign</a></td><td class="desc"></td></tr>
<tr id="row_11_" class="odd"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_sign_list.html" target="_self">SignList</a></td><td class="desc"></td></tr>
<tr id="row_12_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_state.html" target="_self">State</a></td><td class="desc"></td></tr>
<tr id="row_13_" class="odd"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_worker.html" target="_self">Worker</a></td><td class="desc"></td></tr>
<tr id="row_14_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_worker_item.html" target="_self">WorkerItem</a></td><td class="desc"></td></tr>
</table>
</div><!-- directory -->
</div><!-- contents -->
</div><!-- doc-content -->
<!-- start footer part -->
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
<ul>
<li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.7 </li>
</ul>
</div>
</body>
</html>
18 changes: 18 additions & 0 deletions Doxygen-Doc/html/annotated_dup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
var annotated_dup =
[
[ "Attrib", "struct_attrib.html", "struct_attrib" ],
[ "Block", "struct_block.html", "struct_block" ],
[ "Chunk", "struct_chunk.html", "struct_chunk" ],
[ "FPS", "struct_f_p_s.html", "struct_f_p_s" ],
[ "Map", "struct_map.html", "struct_map" ],
[ "MapEntry", "union_map_entry.html", "union_map_entry" ],
[ "Model", "struct_model.html", "struct_model" ],
[ "Player", "struct_player.html", "struct_player" ],
[ "Ring", "struct_ring.html", "struct_ring" ],
[ "RingEntry", "struct_ring_entry.html", "struct_ring_entry" ],
[ "Sign", "struct_sign.html", "struct_sign" ],
[ "SignList", "struct_sign_list.html", "struct_sign_list" ],
[ "State", "struct_state.html", "struct_state" ],
[ "Worker", "struct_worker.html", "struct_worker" ],
[ "WorkerItem", "struct_worker_item.html", "struct_worker_item" ]
];
Loading