Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
18e0d86
mappe
AtleNyhus Sep 30, 2020
ae31b0a
added classed
AtleNyhus Sep 30, 2020
0cd823f
ting og sager
AtleNyhus Sep 30, 2020
e44fc18
Create .gitignore
signetoftgaard Oct 5, 2020
4f7cf6a
Revert "Create .gitignore"
signetoftgaard Oct 5, 2020
a5661e3
Revert "Revert "Create .gitignore""
signetoftgaard Oct 5, 2020
bc58dbf
Setup of client and server folders
AsgerLanghoff Oct 5, 2020
f97dd62
Merge branch 'master' of https://github.com/AsgerLanghoff/Gruppe-306-…
AsgerLanghoff Oct 5, 2020
3532d06
tank variables and such
signetoftgaard Oct 5, 2020
14704bf
det virker ikke
AtleNyhus Oct 5, 2020
ac37031
setup of server
AsgerLanghoff Oct 6, 2020
d760e79
Setup of online server and a test client
AsgerLanghoff Oct 9, 2020
bab51f7
enabled multithreading on server.
AsgerLanghoff Oct 9, 2020
7b5ef3b
Setup of serverTestClient
AsgerLanghoff Oct 9, 2020
c005e4b
.
AsgerLanghoff Oct 9, 2020
80b0899
.
AsgerLanghoff Oct 9, 2020
7e16376
added files to gitIgnore
AsgerLanghoff Oct 9, 2020
439f8dd
javafx tests
signetoftgaard Oct 12, 2020
7fdaa43
.
signetoftgaard Oct 12, 2020
b4f1723
Merge branch 'master' into atle-tester-tanks
AtleNyhus Oct 12, 2020
5c8b672
.
AsgerLanghoff Oct 12, 2020
320b844
Merge branch 'tank-branch'
AsgerLanghoff Oct 12, 2020
bfca6d1
.
JacobNoer Oct 12, 2020
a0742ba
Merge remote-tracking branch 'origin/signebranch' into atle-tester-tanks
AtleNyhus Oct 12, 2020
f975752
Merge branch 'master' into atle-tester-tanks
AtleNyhus Oct 12, 2020
a6efc67
a
signetoftgaard Oct 12, 2020
846cfae
added settings to gitignore
AsgerLanghoff Oct 12, 2020
049a4b9
projectile
AtleNyhus Oct 12, 2020
282ebe8
tank class
signetoftgaard Oct 12, 2020
9ce2370
Merge branch 'master' into tank-branch
signetoftgaard Oct 12, 2020
9e6afba
test setup af server. ikke funktionelt.
AsgerLanghoff Oct 13, 2020
b979905
Update workspace.xml
AtleNyhus Oct 15, 2020
67e0866
commit
signetoftgaard Oct 16, 2020
48bf417
Revert "added settings to gitignore"
AsgerLanghoff Oct 16, 2020
05ca87a
revert to functional build
AsgerLanghoff Oct 16, 2020
669d712
same as last.
AsgerLanghoff Oct 16, 2020
369387f
now with comments
signetoftgaard Oct 16, 2020
a5903eb
test
AsgerLanghoff Oct 16, 2020
df8b118
Merge branch 'master' into atle-tester-tanks
AtleNyhus Oct 19, 2020
1c29835
ting og sager
signetoftgaard Oct 19, 2020
8bd3de4
updated gitignore
AsgerLanghoff Oct 19, 2020
3cba73d
med shitty map
signetoftgaard Oct 20, 2020
5aa6aa3
ændringer ift dead
signetoftgaard Oct 20, 2020
4dbfcfa
Merge branch 'master' of https://github.com/AsgerLanghoff/Gruppe-306-…
signetoftgaard Oct 20, 2020
234a10a
lobby
AtleNyhus Oct 20, 2020
afa7ec3
Merge branch 'master' into atle-tester-tanks
AtleNyhus Oct 20, 2020
5daae9e
Merge pull request #1 from AsgerLanghoff/atle-tester-tanks
AtleNyhus Oct 20, 2020
ab39350
lobby + game
signetoftgaard Oct 20, 2020
839abd3
xml
signetoftgaard Oct 20, 2020
5dc1beb
lobby duplicate check + bugfixes
aomtt Oct 20, 2020
fdc9356
VI tester
JacobNoer Oct 20, 2020
f65c64d
test
JacobNoer Oct 20, 2020
46c2756
ved ikke hvad det er
RasmusSchroeder Oct 20, 2020
d974e3c
.
AsgerLanghoff Oct 20, 2020
8621dce
Working Server lobby
JacobNoer Oct 20, 2020
d9ce6e7
Merge branch 'Server_branch' of https://github.com/AsgerLanghoff/Grup…
JacobNoer Oct 20, 2020
a0fde8c
added client class
signetoftgaard Oct 21, 2020
9a36c39
Merge pull request #2 from AsgerLanghoff/client
signetoftgaard Oct 21, 2020
8d3a001
blah
AtleNyhus Oct 21, 2020
5a81075
.
AsgerLanghoff Oct 21, 2020
c30a846
Merge branch 'Server_branch' of https://github.com/AsgerLanghoff/Grup…
AsgerLanghoff Oct 21, 2020
eeb7553
Merge branch 'master' into atle-tester-tanks
AtleNyhus Oct 21, 2020
0aa9d49
Added tank-wall collision
aomtt Oct 21, 2020
135316a
.
AsgerLanghoff Oct 21, 2020
c28b05d
Merge branch 'stefansbranch'
aomtt Oct 21, 2020
f5bf1d3
server lobby halfway functional.
AsgerLanghoff Oct 22, 2020
2fdfc1f
new function
AtleNyhus Oct 23, 2020
1fd9ee9
Lobby VIRKER!
AtleNyhus Oct 23, 2020
58d1915
Merge branch 'master' into atle-tester-tanks
AtleNyhus Oct 23, 2020
3f19172
Merge pull request #4 from AsgerLanghoff/atle-tester-tanks
AtleNyhus Oct 23, 2020
6f161e2
Server lobby able to create and join servers
AsgerLanghoff Oct 23, 2020
b4bca47
Merge branch 'ServerLobby' into master
AsgerLanghoff Oct 23, 2020
0887e93
Merge pull request #5 from AsgerLanghoff/master
AsgerLanghoff Oct 23, 2020
fbcaf7c
Merge pull request #6 from AsgerLanghoff/ServerLobby
AsgerLanghoff Oct 23, 2020
14bbe0d
remove error files.
AsgerLanghoff Oct 23, 2020
6b02663
removed workerrunnable as it is unused.
AsgerLanghoff Oct 23, 2020
ea3b117
updated gitignore
AsgerLanghoff Oct 23, 2020
d3ba192
update gitignore, and remove unused HandleSession class.
AsgerLanghoff Oct 23, 2020
98b0805
.
AsgerLanghoff Oct 23, 2020
d3d4692
another attempt at gitignore
AsgerLanghoff Oct 23, 2020
42d36a6
attempt at gitignore
AsgerLanghoff Oct 23, 2020
90a0083
.
AsgerLanghoff Oct 23, 2020
8b1cb63
Update .gitignore
AsgerLanghoff Oct 23, 2020
e0f3cb3
Update .gitignore
AsgerLanghoff Oct 23, 2020
9734f06
Update .gitignore
AsgerLanghoff Oct 23, 2020
7f6c2a5
Update .gitignore
AsgerLanghoff Oct 23, 2020
845c82d
Update lib.xml
AsgerLanghoff Oct 23, 2020
b39dcaa
Update lib.xml
AsgerLanghoff Oct 23, 2020
c44df7d
Update .gitignore
AsgerLanghoff Oct 26, 2020
690812a
Update workspace.xml
AsgerLanghoff Oct 26, 2020
2e862df
Lobby er DONE!!!!!
AtleNyhus Oct 26, 2020
b3d4fe4
Merge branch 'master' into atle-tester-tanks
AtleNyhus Oct 26, 2020
bbfbdc8
commit
AtleNyhus Oct 27, 2020
4698d86
Merge remote-tracking branch 'origin/atle-tester-tanks' into atle-tes…
AtleNyhus Oct 27, 2020
e3e240e
updated lobby
AtleNyhus Oct 27, 2020
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
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
*.lib.xml
Tank game - Client\.idea\libraries\lib.xml
Tank game - Client\.idea\libraries
Tank game - Client\.idea
Tank game - Client\out
Tank game - Client/.idea/libraries/lib.xml
*.xml
*.xml
11 changes: 11 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/Gruppe-306-PCSS.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/lib.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

124 changes: 124 additions & 0 deletions .idea/uiDesigner.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading