Skip to content

Ked branch #12

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

Open
wants to merge 116 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
b9d9ff1
Initial commit
github-classroom[bot] Jan 25, 2025
12307f3
Added demo stuff
SaasKu Jan 26, 2025
c1101a1
Added demo stuff
SaasKu Jan 26, 2025
fa992f5
added power and steering curves for movement
Jan 31, 2025
1d74144
added power and steering curves for movement
Jan 31, 2025
9ebc7cc
better driver cam
Feb 1, 2025
0636e3f
better driver cam
Feb 1, 2025
559d8be
better camera movement for driver
Feb 1, 2025
e3dc06d
better camera movement for driver
Feb 1, 2025
c093bcf
working on items
SaasKu Feb 1, 2025
b54f2c6
working on items
SaasKu Feb 1, 2025
e992fa2
added item assets
SaasKu Feb 1, 2025
6f1af3c
added item assets
SaasKu Feb 1, 2025
55eb9be
Added item box animations and detection
SaasKu Feb 1, 2025
5fe6498
Added item box animations and detection
SaasKu Feb 1, 2025
2755d83
set up basic signals via SignalBus
SaasKu Feb 3, 2025
a55a1da
set up basic signals via SignalBus
SaasKu Feb 3, 2025
d0cae6d
changed some vehicle values
SaasKu Feb 3, 2025
4d53dfa
changed some vehicle values
SaasKu Feb 3, 2025
7f265df
finished basic version of driver item system
SaasKu Feb 3, 2025
def2e56
finished basic version of driver item system
SaasKu Feb 3, 2025
cfe2033
added track from rhino
SaasKu Feb 3, 2025
d6e5aea
added track from rhino
SaasKu Feb 3, 2025
77abaa6
Reorganized files
kedrickfudala Feb 6, 2025
a00e3df
Reorganized files
kedrickfudala Feb 6, 2025
43ef6ba
reorganized files, added game container, added main menu and map sele…
kedrickfudala Feb 15, 2025
2136166
reorganized files, added game container, added main menu and map sele…
kedrickfudala Feb 15, 2025
e77e777
started work on checkpoint system
SaasKu Feb 18, 2025
180e728
started work on checkpoint system
SaasKu Feb 18, 2025
2dc5805
continued work on checkpoints
SaasKu Feb 18, 2025
96464b3
continued work on checkpoints
SaasKu Feb 18, 2025
2f73f65
devil item system
kedrickfudala Feb 18, 2025
b7f0ffc
devil item system
kedrickfudala Feb 18, 2025
7cebb49
checkpoint system update
SaasKu Feb 22, 2025
3e3c8e4
checkpoint system update
SaasKu Feb 22, 2025
831bb29
Resolved merge conflicts
SaasKu Feb 22, 2025
15ce900
Resolved merge conflicts
SaasKu Feb 22, 2025
84d894a
fixes for checkpoint system
SaasKu Feb 22, 2025
3c230fd
fixes for checkpoint system
SaasKu Feb 22, 2025
7c776fb
water
SaasKu Mar 1, 2025
c71ba7f
water
SaasKu Mar 1, 2025
777e6dd
new car
kedrickfudala Mar 1, 2025
4deda58
new car
kedrickfudala Mar 1, 2025
2b0864e
added new car
kedrickfudala Mar 1, 2025
a609988
added new car
kedrickfudala Mar 1, 2025
ae0ae71
Merge pull request #1 from UVASGD/ked-branch
SaasKu Mar 1, 2025
1d9e692
Merge pull request #1 from UVASGD/ked-branch
SaasKu Mar 1, 2025
8b0dea2
animations for warship
SaasKu Mar 1, 2025
536fb77
animations for warship
SaasKu Mar 1, 2025
d0aea40
resolved merge conflicts
SaasKu Mar 1, 2025
eec4393
resolved merge conflicts
SaasKu Mar 1, 2025
99ff277
small changes and new trail effects
SaasKu Mar 3, 2025
73d70f9
small changes and new trail effects
SaasKu Mar 3, 2025
cf12877
breakable columns, new missile, new crosshair
SaasKu Mar 3, 2025
6c4634a
breakable columns, new missile, new crosshair
SaasKu Mar 3, 2025
8d34f25
rocks
SaasKu Mar 3, 2025
2086ad9
rocks
SaasKu Mar 3, 2025
4c2791c
Merge pull request #3 from UVASGD/missile_test
SaasKu Mar 17, 2025
b775f53
Merge pull request #3 from UVASGD/missile_test
SaasKu Mar 17, 2025
f5ea6a0
small changes
SaasKu Mar 24, 2025
bcd52fe
small changes
SaasKu Mar 24, 2025
b135f24
added shield
SaasKu Mar 24, 2025
63bcb54
added shield
SaasKu Mar 24, 2025
d8bb037
updated checkpoint visuals and code
SaasKu Mar 30, 2025
bb9f18d
updated checkpoint visuals and code
SaasKu Mar 30, 2025
d9adab3
small changes
SaasKu Apr 5, 2025
7c2fd86
small changes
SaasKu Apr 5, 2025
bda17e7
Merge pull request #4 from UVASGD/missile_test
SaasKu Apr 5, 2025
6474971
Merge pull request #4 from UVASGD/missile_test
SaasKu Apr 5, 2025
c569719
Oil Spill devil power
kedrickfudala Apr 5, 2025
0f49e1a
Oil Spill devil power
kedrickfudala Apr 5, 2025
44ebeb3
Merge branch 'main' of https://github.com/UVASGD/spring-2025-burnout-…
kedrickfudala Apr 5, 2025
012d39a
cutscene fixes
SaasKu Apr 7, 2025
b13cddd
cutscene fixes
SaasKu Apr 7, 2025
60a6654
small menu changes
SaasKu Apr 7, 2025
ea6037a
small menu changes
SaasKu Apr 7, 2025
f153c64
Added time trials
SaasKu Apr 8, 2025
075324c
Added time trials
SaasKu Apr 8, 2025
72f7026
new bagger test scene
SaasKu Apr 10, 2025
2f6232b
new bagger test scene
SaasKu Apr 10, 2025
6b2817a
resolved merge conflicts
SaasKu Apr 10, 2025
d73dd84
resolved merge conflicts
SaasKu Apr 10, 2025
d109fcb
Moved oil logic to integrate it into item system
SaasKu Apr 10, 2025
78d297d
Moved oil logic to integrate it into item system
SaasKu Apr 10, 2025
3b428da
Merge pull request #6 from UVASGD/ked-branch
SaasKu Apr 10, 2025
cfd5c73
Merge pull request #6 from UVASGD/ked-branch
SaasKu Apr 10, 2025
d7607d4
resolve merge conflicts
SaasKu Apr 12, 2025
723af6e
resolve merge conflicts
SaasKu Apr 12, 2025
981d2c0
fixed driver falling through track after checkpoints
SaasKu Apr 12, 2025
ee1010d
fixed driver falling through track after checkpoints
SaasKu Apr 12, 2025
8936175
breakable walls
SaasKu Apr 12, 2025
0c09faf
breakable walls
SaasKu Apr 12, 2025
d378494
work for bagger implementation
SaasKu Apr 21, 2025
f2b3447
work for bagger implementation
SaasKu Apr 21, 2025
02839ca
Merge branch 'menu_expansion' of https://github.com/UVASGD/spring-202…
kedrickfudala Apr 21, 2025
e0fff47
more progress for integrating bagger into item system
SaasKu Apr 25, 2025
3742872
Bagger works!!!!
SaasKu Apr 26, 2025
d284436
spacelaser
SaasKu Apr 26, 2025
cacbba6
added black hole item
kedrickfudala Apr 26, 2025
1c951cd
removed evil tower >:(
SaasKu Apr 26, 2025
b1bb4de
fixed merge conflicts
SaasKu Apr 26, 2025
d4bd888
fixed
SaasKu Apr 26, 2025
fbac7cc
Merge pull request #7 from UVASGD/ked-branch
SaasKu Apr 26, 2025
4d4ff85
resolve merge conflicts for pulling main
SaasKu Apr 26, 2025
044a38e
Merge pull request #8 from UVASGD/menu_expansion
SaasKu Apr 26, 2025
611a12b
redid violence track
SaasKu Apr 26, 2025
b9a9c65
worked on v_greed
SaasKu Apr 26, 2025
5296d68
shark added
kedrickfudala Apr 26, 2025
16e8571
Merge branch 'main' into ked-branch
kedrickfudala Apr 26, 2025
c47d3a2
Merge pull request #9 from UVASGD/ked-branch
kedrickfudala Apr 26, 2025
d8c7181
cleanup
kedrickfudala Apr 26, 2025
964880d
Merge pull request #10 from UVASGD/ked-branch
kedrickfudala Apr 26, 2025
24efcad
Merge branch 'menu_expansion' of https://github.com/UVASGD/spring-202…
kedrickfudala Apr 26, 2025
1bab242
more cleanup
kedrickfudala Apr 26, 2025
7c25a82
updated main menu and added music
kedrickfudala Apr 27, 2025
7c805c6
added breakable wall and ufo items
kedrickfudala Apr 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Normalize EOL for all files that Git considers text files.
* text=auto eol=lf
62 changes: 3 additions & 59 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,59 +1,3 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Mm]emoryCaptures/

# Never ignore Asset meta data
!/[Aa]ssets/**/*.meta

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.unitypackage

# Crashlytics generated file
crashlytics-build.properties
# Godot 4+ specific ignores
.godot/
/android/
10 changes: 10 additions & 0 deletions .reuse/dep5
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Destruction Addon
Upstream-Contact: Jummit <jummit@web.de>
Source: https://github.com/Jummit/godot-destruction-plugin

# Sample paragraph, commented out:
#
# Files: src/*
# Copyright: $YEAR $NAME <$CONTACT>
# License: ...
36 changes: 36 additions & 0 deletions Autoload/SignalBus.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
extends Node

# Driver signals
signal driver_item_taken
signal driver_giving_item
signal update_engine_force(modifier:String, amount:float)
signal clear_driver_item
signal driver_play_animation(anim_name: String)
signal driver_play_animation_backwards(anim_name: String)
signal out_of_bounds
signal driver_change_invul

# Track signals
signal update_checkpoint(name:String)
signal revert_checkpoints
signal update_laps_left(laps_left:String)
signal end_track
signal map_has_controllable(name:String)

# Devil Signals
signal devil_item_taken
signal devil_giving_item
signal clear_devil_item
signal devil_play_animation
signal toggle_crosshair

# Item Signals
# Bagger
signal activate_controllable(c_name: String, num_uses: int)
signal devil_controllable_status()

# Menu Signals
signal back_to_menu

#Split screen signals
signal change_screen_visibility(name:String)
121 changes: 121 additions & 0 deletions LICENSES/CC0-1.0.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
Creative Commons Legal Code

CC0 1.0 Universal

CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
HEREUNDER.

Statement of Purpose

The laws of most jurisdictions throughout the world automatically confer
exclusive Copyright and Related Rights (defined below) upon the creator
and subsequent owner(s) (each and all, an "owner") of an original work of
authorship and/or a database (each, a "Work").

Certain owners wish to permanently relinquish those rights to a Work for
the purpose of contributing to a commons of creative, cultural and
scientific works ("Commons") that the public can reliably and without fear
of later claims of infringement build upon, modify, incorporate in other
works, reuse and redistribute as freely as possible in any form whatsoever
and for any purposes, including without limitation commercial purposes.
These owners may contribute to the Commons to promote the ideal of a free
culture and the further production of creative, cultural and scientific
works, or to gain reputation or greater distribution for their Work in
part through the use and efforts of others.

For these and/or other purposes and motivations, and without any
expectation of additional consideration or compensation, the person
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
is an owner of Copyright and Related Rights in the Work, voluntarily
elects to apply CC0 to the Work and publicly distribute the Work under its
terms, with knowledge of his or her Copyright and Related Rights in the
Work and the meaning and intended legal effect of CC0 on those rights.

1. Copyright and Related Rights. A Work made available under CC0 may be
protected by copyright and related or neighboring rights ("Copyright and
Related Rights"). Copyright and Related Rights include, but are not
limited to, the following:

i. the right to reproduce, adapt, distribute, perform, display,
communicate, and translate a Work;
ii. moral rights retained by the original author(s) and/or performer(s);
iii. publicity and privacy rights pertaining to a person's image or
likeness depicted in a Work;
iv. rights protecting against unfair competition in regards to a Work,
subject to the limitations in paragraph 4(a), below;
v. rights protecting the extraction, dissemination, use and reuse of data
in a Work;
vi. database rights (such as those arising under Directive 96/9/EC of the
European Parliament and of the Council of 11 March 1996 on the legal
protection of databases, and under any national implementation
thereof, including any amended or successor version of such
directive); and
vii. other similar, equivalent or corresponding rights throughout the
world based on applicable law or treaty, and any national
implementations thereof.

2. Waiver. To the greatest extent permitted by, but not in contravention
of, applicable law, Affirmer hereby overtly, fully, permanently,
irrevocably and unconditionally waives, abandons, and surrenders all of
Affirmer's Copyright and Related Rights and associated claims and causes
of action, whether now known or unknown (including existing as well as
future claims and causes of action), in the Work (i) in all territories
worldwide, (ii) for the maximum duration provided by applicable law or
treaty (including future time extensions), (iii) in any current or future
medium and for any number of copies, and (iv) for any purpose whatsoever,
including without limitation commercial, advertising or promotional
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
member of the public at large and to the detriment of Affirmer's heirs and
successors, fully intending that such Waiver shall not be subject to
revocation, rescission, cancellation, termination, or any other legal or
equitable action to disrupt the quiet enjoyment of the Work by the public
as contemplated by Affirmer's express Statement of Purpose.

3. Public License Fallback. Should any part of the Waiver for any reason
be judged legally invalid or ineffective under applicable law, then the
Waiver shall be preserved to the maximum extent permitted taking into
account Affirmer's express Statement of Purpose. In addition, to the
extent the Waiver is so judged Affirmer hereby grants to each affected
person a royalty-free, non transferable, non sublicensable, non exclusive,
irrevocable and unconditional license to exercise Affirmer's Copyright and
Related Rights in the Work (i) in all territories worldwide, (ii) for the
maximum duration provided by applicable law or treaty (including future
time extensions), (iii) in any current or future medium and for any number
of copies, and (iv) for any purpose whatsoever, including without
limitation commercial, advertising or promotional purposes (the
"License"). The License shall be deemed effective as of the date CC0 was
applied by Affirmer to the Work. Should any part of the License for any
reason be judged legally invalid or ineffective under applicable law, such
partial invalidity or ineffectiveness shall not invalidate the remainder
of the License, and in such case Affirmer hereby affirms that he or she
will not (i) exercise any of his or her remaining Copyright and Related
Rights in the Work or (ii) assert any associated claims and causes of
action with respect to the Work, in either case contrary to Affirmer's
express Statement of Purpose.

4. Limitations and Disclaimers.

a. No trademark or patent rights held by Affirmer are waived, abandoned,
surrendered, licensed or otherwise affected by this document.
b. Affirmer offers the Work as-is and makes no representations or
warranties of any kind concerning the Work, express, implied,
statutory or otherwise, including without limitation warranties of
title, merchantability, fitness for a particular purpose, non
infringement, or the absence of latent or other defects, accuracy, or
the present or absence of errors, whether or not discoverable, all to
the greatest extent permissible under applicable law.
c. Affirmer disclaims responsibility for clearing rights of other persons
that may apply to the Work or any use thereof, including without
limitation any person's Copyright and Related Rights in the Work.
Further, Affirmer disclaims responsibility for obtaining any necessary
consents, permissions or other rights required for any use of the
Work.
d. Affirmer understands and acknowledges that Creative Commons is not a
party to this document and has no duty or obligation with respect to
this CC0 or use of the Work.
9 changes: 9 additions & 0 deletions LICENSES/MIT.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
MIT License

Copyright (c) <year> <copyright holders>

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Loading