Skip to content

master in scorecounter #10

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 224 commits into
base: scorecounter
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
224 commits
Select commit Hold shift + click to select a range
17ab2e8
sorta werkend
aslokaa Apr 10, 2020
cf23583
iets beter werkend
aslokaa Apr 10, 2020
68e2086
Schijder van de verschillende dingen in de dataset
aslokaa Apr 10, 2020
2750e80
poging 2
aslokaa Apr 10, 2020
178dbd3
Het werkt
aslokaa Apr 10, 2020
228e7d6
nettere variable namen
aslokaa Apr 10, 2020
445a1c5
added handler and reader.
aslokaa Apr 15, 2020
6c4ceb8
Comments related to reading csv files
aslokaa Apr 15, 2020
7dc62d9
comment iets netter
aslokaa Apr 15, 2020
1afda8e
Merge branch 'master' into Dataset
codevogel Apr 15, 2020
0c30fc0
The multiple choice now works
aslokaa Apr 16, 2020
a6b90bb
coimments
aslokaa Apr 16, 2020
8365bcd
Added pausescreen
aslokaa Apr 17, 2020
ff4ffb2
NodeManager no longer throws not implemented when paused
aslokaa Apr 17, 2020
5255cc2
Question displaying
aslokaa Apr 23, 2020
c0e72cc
update that breaks it
aslokaa Apr 23, 2020
6626a67
Revert "update that breaks it"
aslokaa Apr 23, 2020
adf528d
Revert "Revert "update that breaks it""
aslokaa Apr 23, 2020
7bea14c
The compare is working again
aslokaa Apr 23, 2020
b533b89
cleanup
aslokaa Apr 23, 2020
36eafa9
submitButton
aslokaa Apr 24, 2020
de79bff
Update Checkpoint.unity
aslokaa Apr 24, 2020
0053a7d
Game now correctly resonds while in checkpoint
aslokaa Apr 24, 2020
d95ae39
fix
aslokaa May 7, 2020
f13ef8c
removed unsolvable options
aslokaa May 7, 2020
75a74a4
Health en Gameover state.
BenjaminvdBerg May 12, 2020
dfa7cb6
tracer
aslokaa May 13, 2020
472a91e
Merge pull request #4 from kemmel-dev/PauseScreen
codevogel May 14, 2020
548d71f
Merge pull request #5 from kemmel-dev/mergebranch
codevogel May 14, 2020
c3cc179
Merge pull request #6 from kemmel-dev/Checkpoints
codevogel May 14, 2020
db2c3f5
Merge branch 'mergebranch' into CannonTracer
codevogel May 14, 2020
368297a
Merge pull request #8 from kemmel-dev/CannonTracer
codevogel May 14, 2020
4b76a7a
Merge branch 'mergebranch' into HealthAndGameover
codevogel May 14, 2020
0366149
Merge pull request #9 from kemmel-dev/HealthAndGameover
codevogel May 14, 2020
9bf4beb
Fix merge errors
codevogel May 14, 2020
8793f95
added tracer
aslokaa May 14, 2020
370ef09
build settingsignore
aslokaa May 14, 2020
942f87b
Added health adjuster
BenjaminvdBerg May 14, 2020
ac95df1
cannonshootin
aslokaa May 14, 2020
054e2df
Damage and GameOver Audio
aslokaa May 14, 2020
516530d
scenecommit
aslokaa May 14, 2020
9868e31
Node Destroyed Audio and scene cleanup
aslokaa May 14, 2020
29e583d
updated main menu looks
codevogel May 14, 2020
28c06e5
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
codevogel May 14, 2020
7977190
Merge master
codevogel May 14, 2020
cd67747
Update MainScene.unity
aslokaa May 15, 2020
be755ba
sounds
aslokaa May 15, 2020
636f8eb
Revert "Update MainScene.unity"
aslokaa May 15, 2020
1eec708
Revert "sounds"
aslokaa May 15, 2020
08cbc02
init
aslokaa May 15, 2020
681c83e
Screen shake animation
BenjaminvdBerg May 15, 2020
6dea358
inheritance
aslokaa May 15, 2020
6cc9279
NodeParticles
aslokaa May 15, 2020
b1b1474
nevermind de nodeparticles
aslokaa May 15, 2020
d0ce658
NodeParticles
aslokaa May 15, 2020
00671a4
mulrtiple nodes at the same time
aslokaa May 16, 2020
6adc6e8
comment
aslokaa May 16, 2020
b903bda
Particles for nodes in transit
aslokaa May 16, 2020
da51634
cleanup
aslokaa May 16, 2020
ee8efe9
scene update
aslokaa May 16, 2020
443ac0d
Fixed triangle over ball that is about to be shot
aslokaa May 16, 2020
6dd1ded
comments
aslokaa May 16, 2020
71b6738
checkpoiints on map
aslokaa May 16, 2020
fa964a1
tracer no longers shows when it is not supposed to
aslokaa May 16, 2020
6422153
refactor array to nodeArray
codevogel May 21, 2020
3d6938d
refactor array to nodeArray
codevogel May 21, 2020
0b06856
Add first version of class diagrams for Kamiel
codevogel May 21, 2020
3f18b9b
Merge branch 'sounds'
codevogel May 21, 2020
1af08f8
Merge master into particles
codevogel May 21, 2020
af65de0
Fix warning on startup
codevogel May 21, 2020
2d9fdd3
Merge checkpoints-dataset into master
codevogel May 21, 2020
804ce41
Fixed warnings on startup
codevogel May 21, 2020
7aea634
Merge scorecounter into master
codevogel May 21, 2020
55ebc00
Fixed more warnings on startup, a few still exist
codevogel May 21, 2020
97d73b2
Audio fix
aslokaa May 22, 2020
38ef234
More audio fixes
aslokaa May 22, 2020
8106171
added background and changed the colours of some things
aslokaa May 25, 2020
d6a8255
more colour changes
aslokaa May 25, 2020
8892614
particle upgrade
aslokaa May 25, 2020
4959d12
AddCheckpointScore toegevoegd aan de checkpoint vragen. 1000 punten p…
Phantros May 26, 2020
5dea9c7
Kleine gameoverscore functie toegevoegd. Als je verliest wordt je sco…
Phantros May 26, 2020
972038a
Add files via upload
Phantros May 27, 2020
48edefe
Balls move back on damage
BenjaminvdBerg May 27, 2020
31b30e5
Merge remote-tracking branch 'origin/Sprites'
codevogel May 27, 2020
5a1efa1
Delete Retrospectives Eindproduct.docx
Phantros May 27, 2020
4d8209f
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
codevogel May 27, 2020
9c529d4
Create Eindproduct
Phantros May 27, 2020
2aa1101
Delete Eindproduct
Phantros May 27, 2020
4d39e50
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
codevogel May 27, 2020
bc7f8bf
Merge remote-tracking branch 'origin/final-scorecounter'
codevogel May 27, 2020
7e8bc0c
Merged all branches
codevogel May 27, 2020
60e6c32
Turned on checkpoints
aslokaa May 27, 2020
a1c4419
merge scorecounter into master
codevogel May 27, 2020
9263496
Revert "merge scorecounter into master"
aslokaa May 27, 2020
cbe45f9
stars
aslokaa May 27, 2020
0c29a0d
Health adjuster
aslokaa May 27, 2020
e92dcbc
fix warnings, set graphics API to vulkan>dx12>dx11
codevogel May 27, 2020
8e2fa11
Altered path, prevent bug where balls can't move back because path en…
codevogel May 27, 2020
f866fd4
more questions
aslokaa May 27, 2020
1e2c4e3
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
aslokaa May 27, 2020
bcd8cd0
Made number nodes smaller, spawn 25 nodes initially
codevogel May 27, 2020
82aca69
Added a texture for the tracer
codevogel May 27, 2020
58a6af9
Checkpoint when destroying nodes
aslokaa May 27, 2020
e324e6d
Added chalk sprite for numbernodes
codevogel May 27, 2020
82f61b3
menu switch
aslokaa May 27, 2020
465e9c0
Nederlands
aslokaa May 27, 2020
9faa063
Meer nederlands
aslokaa May 27, 2020
2cdadc9
Added colors to nodes
codevogel May 27, 2020
3e2e1fb
alter fonts
codevogel May 27, 2020
a7f93e8
Volgende bal tekst weggehaald
aslokaa May 27, 2020
91d8938
better placement
aslokaa May 27, 2020
bdfa3ec
Gutter now leads to cannon
aslokaa May 27, 2020
a2ddf57
better gutter
aslokaa May 27, 2020
ccdd171
Checkpoint devtool better
aslokaa May 27, 2020
9a71bea
Update MainScene.unity
aslokaa May 27, 2020
8db841e
MoveBackAdjuster
BenjaminvdBerg May 27, 2020
f9a7674
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
BenjaminvdBerg May 27, 2020
a69819f
Fixed MoveBackAdjuster
BenjaminvdBerg May 27, 2020
c1da4cf
Moved canon, changed gutter
BenjaminvdBerg May 27, 2020
cbffada
Removed magic numbers
Phantros May 28, 2020
b3e01c1
Star sound
aslokaa May 28, 2020
e6df818
cleaned up checkpoint scene
codevogel May 28, 2020
dab5521
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
codevogel May 28, 2020
91150d3
Starsound
aslokaa May 28, 2020
b36fc7b
checkpoint
aslokaa May 28, 2020
71129ee
Add winscreen
codevogel May 28, 2020
98e9588
Add loss screen
codevogel May 28, 2020
4e9be10
Score visible on loss screen
aslokaa May 28, 2020
0ce093a
Added loss screen, winscreen + buttons to go back to menu
codevogel May 28, 2020
7818da8
Score to winscreen
aslokaa May 28, 2020
3a1e069
Gameplay music
aslokaa May 28, 2020
f66bb8d
Clean up main menu
codevogel May 28, 2020
899c4f0
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
codevogel May 28, 2020
8882c02
Menu music
aslokaa May 28, 2020
5afd17d
Win and loss screen msuic
aslokaa May 28, 2020
faab6ab
Menu image fixed
codevogel May 28, 2020
e0a8942
cannon particles move with cannon
aslokaa May 28, 2020
52578d7
changed health lost
aslokaa May 28, 2020
11ef48f
Clean up pausescreen
codevogel May 28, 2020
ccb0e72
git Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
codevogel May 28, 2020
0b29bf1
Translate button text into Dutch
codevogel May 28, 2020
0a7b863
Change background color of main camera in main scene
codevogel May 28, 2020
9fc847c
changed main menu music
codevogel May 28, 2020
ed83b0d
Changed in game music
codevogel May 28, 2020
bb66257
Adjust mainscene music volume
codevogel May 28, 2020
fb4c1c4
Disable audio listener in pause screen's camera
codevogel May 28, 2020
0a82ae1
Instructions added
aslokaa May 28, 2020
40dd010
Fixed going gameover and keeping your score
aslokaa May 28, 2020
c0db2bf
Cannonsprite
aslokaa May 28, 2020
b73a94c
removed double damage
aslokaa May 28, 2020
f6cf490
adjust cannon sprite position
codevogel May 28, 2020
5ff968c
Path visual
aslokaa May 28, 2020
6457d5e
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
aslokaa May 28, 2020
9e6a93e
Update MainScene.unity
aslokaa May 28, 2020
19114cc
Revert "Update MainScene.unity"
aslokaa May 28, 2020
ac322c1
Update MainScene.unity
aslokaa May 28, 2020
43bf7cb
checkoint markers
aslokaa May 28, 2020
85a6c94
Update MainScene.unity
aslokaa May 28, 2020
ba03446
add quit game to end screens
codevogel May 28, 2020
3efd430
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
codevogel May 28, 2020
174cdb2
change instruction text to white
codevogel May 28, 2020
e40f2d9
Update MainScene.unity
aslokaa May 28, 2020
87011dd
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
aslokaa May 28, 2020
c4d3bcb
Edit instruction text for better readability
codevogel May 28, 2020
91e9923
Update WinScreen.unity
aslokaa May 28, 2020
0820fa6
disable tutorial text on startup
codevogel May 28, 2020
41bb35d
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
aslokaa May 28, 2020
c273304
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
aslokaa May 28, 2020
ee5f27b
Update LossScreen.unity
aslokaa May 28, 2020
23e3225
Update Checkpoint.unity
aslokaa May 28, 2020
69af553
Added build
codevogel May 28, 2020
9cfe7dc
Add csv data to build folder
codevogel May 28, 2020
b73f118
Change pause button to Escape
codevogel May 28, 2020
317385c
Remove uncalled functions
codevogel May 28, 2020
45a1ec1
Line during paused
aslokaa May 28, 2020
478d8f9
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
aslokaa May 28, 2020
28d2c55
Remove build
codevogel May 28, 2020
9027c81
Add Build
codevogel May 28, 2020
3de6cfb
Locked rotation of ball in cannon
codevogel May 28, 2020
6330bea
startmenu altered
codevogel May 28, 2020
9b462c4
Add files via upload
Phantros May 28, 2020
f880326
remove build
codevogel May 28, 2020
b1d66b4
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
codevogel May 28, 2020
10d9b81
add build
codevogel May 28, 2020
dec4f7d
Add files via upload
Phantros May 28, 2020
d7e6ca4
Add design document
codevogel May 29, 2020
6263bf8
Changed directory of design document
codevogel May 29, 2020
a8a51f7
Create Klassendiagram Niklas.png
aslokaa May 29, 2020
01f0a27
Added my class diagram lol
BenjaminvdBerg May 29, 2020
8b1cf89
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
BenjaminvdBerg May 29, 2020
fb45226
Create Logboek PAD team 6.docx
aslokaa Jun 3, 2020
15aadd5
Refactor and comment
codevogel Jun 3, 2020
cdb70cc
Refactor and comment
codevogel Jun 3, 2020
998f2f2
Refactor and comment
codevogel Jun 3, 2020
31add70
Refactor and comment
codevogel Jun 3, 2020
c31146b
Refactor and comment
codevogel Jun 3, 2020
9f4dd24
Refactor and comment
codevogel Jun 3, 2020
fe54dcd
Refactor and comment
codevogel Jun 3, 2020
ed7d3da
Refactor and comment
codevogel Jun 3, 2020
eebc588
Refactor and comment
codevogel Jun 3, 2020
b4e54db
Refactor and comment
codevogel Jun 3, 2020
41e7c01
Refactor and comment
codevogel Jun 3, 2020
aa3b3c5
Refactor and comment
codevogel Jun 3, 2020
d9a12f5
Refactor and comment
codevogel Jun 3, 2020
bc53984
Refactor and comment
codevogel Jun 3, 2020
e1be007
Refactor and comment
codevogel Jun 3, 2020
3c696e4
Refactor and comment
codevogel Jun 3, 2020
e7842b8
Refactor and comment
codevogel Jun 3, 2020
49721c7
Refactor and comment
codevogel Jun 3, 2020
ebfea6c
Refactor and comment
codevogel Jun 3, 2020
8022bcc
Refactor and comment
codevogel Jun 3, 2020
5d2a990
Refactor and comment
codevogel Jun 3, 2020
74e381d
Refactor and comment
codevogel Jun 3, 2020
fd72e38
Refactor and comment
codevogel Jun 3, 2020
b139b90
Create Reflectie en Feedback.docx
aslokaa Jun 3, 2020
a2cfdba
Update Kamiel's class diagram with refactor changes
codevogel Jun 4, 2020
703d21e
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
codevogel Jun 4, 2020
82c68fc
Add link to directory in readme
codevogel Jun 4, 2020
590ff81
Fix markdown in readme
codevogel Jun 4, 2020
d3db08f
Update reflectie en feedback with daniel en benjamins content
codevogel Jun 4, 2020
2a3111e
Comments
BenjaminvdBerg Jun 4, 2020
f0c29d7
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
BenjaminvdBerg Jun 4, 2020
ad1d26d
Update Reflectie en Feedback.docx
aslokaa Jun 4, 2020
28e33d1
Merge branch 'master' of https://github.com/kemmel-dev/Zumath-Unity
aslokaa Jun 4, 2020
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
  •  
  •  
  •  
Binary file not shown.
Binary file not shown.
42 changes: 42 additions & 0 deletions ! Build/MonoBleedingEdge/etc/mono/2.0/Browsers/Compat.browser
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!--
This file defines some of the browsers that Microsoft's implementation provides in
<windir>\Microsoft.NET\Framework\<ver>\CONFIG\Browsers\*.browser

It is not derived from any file distributed with Microsoft's implementation. Since
we can't distribute MS's browser files, we use browscap.ini to determine
browser capabilities. Then, if and only if the application contains App_Browser/*.browser
files and we are using .NET 2.0 or higher, we supplement the capabilities with the
information in those files and the files in this directory. The primary goal of this file
is provide browser definitions that might be referenced in App_Browser/*.browser files.
-->
<browsers>
<defaultBrowser id="Default">
</defaultBrowser>
<browser id="Default">
<identification>
<userAgent match="." />
</identification>
</browser>
<browser id="IE6to9" parentID="Default">
<identification>
<capability name="majorver" match="^[6-9]" />
<capability name="browser" match="^(IE|AOL)$" />
</identification>
</browser>
<browser id="Opera8to9" parentID="Default">
<identification>
<capability name="majorver" match="^[8-9]" />
<capability name="browser" match="^Opera$" />
</identification>
</browser>
<browser id="Safari" parentID="Default">
<identification>
<capability name="browser" match="^Safari$" />
</identification>
</browser>
<browser id="Mozilla" parentID="Default">
<identification>
<capability name="browser" match="^Mozilla" />
</identification>
</browser>
</browsers>
Loading