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.

Sign up for GitHub

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

Jump to bottom

Game #3

Open
wants to merge 69 commits into
base: master
Choose a base branch
from
Open

Game #3

Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
4c8034b
get position fixed
HustonMmmavr Apr 9, 2018
c211bbd
cheat
HaseProgram Apr 10, 2018
c6ee590
cheat[1]
HaseProgram Apr 10, 2018
73e2175
added websocket
HustonMmmavr May 2, 2018
1c73bd7
added mechanics
HustonMmmavr May 3, 2018
3f89282
version fixed
HustonMmmavr May 5, 2018
42f450b
Added userInfo to player
HustonMmmavr May 6, 2018
ab91a3e
added handler and fix some errors
HustonMmmavr May 6, 2018
ae4bb17
now user can change direction
HustonMmmavr May 6, 2018
f96290a
adding lobby
HustonMmmavr May 7, 2018
b3684d5
need to make todo, also think about connection to lobby
HustonMmmavr May 7, 2018
c726865
lobby bugs fixed
HustonMmmavr May 7, 2018
611e457
lobby bugs fixed again, TODO delete unused handlers and messages, add…
HustonMmmavr May 7, 2018
b66c5b2
added messages
HustonMmmavr May 14, 2018
35f1567
added show lobbies
HustonMmmavr May 14, 2018
92929f6
lobbies fixed. TODO: add lobby name
HustonMmmavr May 14, 2018
c646662
fixed lobbies TODO add name
HustonMmmavr May 14, 2018
175695d
lobby has name
HustonMmmavr May 15, 2018
eafb477
show lobbies normally
HustonMmmavr May 15, 2018
44a359f
field is filling
HustonMmmavr May 16, 2018
2465006
added server snapshot
HustonMmmavr May 16, 2018
8afd558
checkstyle fixed
HustonMmmavr May 16, 2018
fce2aeb
need to finish
HustonMmmavr May 17, 2018
514cd26
added some
HustonMmmavr May 19, 2018
710d7d5
added check score, but not works
HustonMmmavr May 19, 2018
134f80b
works check area
HustonMmmavr May 19, 2018
618027d
added new messages
HustonMmmavr May 19, 2018
f4be2bd
users fixed
HustonMmmavr May 19, 2018
0b5f068
now you can get message that user connected, disconnected, but mechan…
HustonMmmavr May 19, 2018
77e3ac2
fixed add player
HustonMmmavr May 20, 2018
820456f
to do think how to start
HustonMmmavr May 20, 2018
bfbc67e
Some lobby fix
HustonMmmavr May 22, 2018
ee24db5
returns seconds
HustonMmmavr May 23, 2018
9d74d19
added new message, need to remove unused function and enum
HustonMmmavr May 23, 2018
68a155b
lobby message returns user nickname
HustonMmmavr May 23, 2018
61d6918
Work with lobby
HaseProgram May 24, 2018
1cda7f1
added gamestart message
HustonMmmavr May 24, 2018
6de5f38
merged conflict
HustonMmmavr May 24, 2018
ef90a72
some fix
HustonMmmavr May 25, 2018
71fe14f
crutch for rk
HustonMmmavr May 25, 2018
e89f62e
crutch for rk
HustonMmmavr May 25, 2018
dd21f86
lobby refactored
HustonMmmavr May 28, 2018
045f510
fix travis
HustonMmmavr May 28, 2018
a2c6eee
fix travis again
HustonMmmavr May 28, 2018
fc52aa6
codestyle fix
HustonMmmavr May 29, 2018
d317041
codestyle fix again
HustonMmmavr May 29, 2018
8aec1f5
checkstyle finally fixed
HustonMmmavr May 29, 2018
580cded
Update README.md
HustonMmmavr May 29, 2018
624f276
Update README.md
HustonMmmavr May 29, 2018
1229a8b
Update README.md
HustonMmmavr May 29, 2018
9b47a54
trying to fix game
HustonMmmavr May 30, 2018
032bf21
Merge branch 'game' of github.com:TechnoparkSDD/S.D.D.-02-2018 into game
HustonMmmavr May 30, 2018
509ae2f
area check algorithm fixed
HaseProgram May 31, 2018
c6d5a31
Basic interpolation realised
HaseProgram May 31, 2018
3542144
disabling recieveing clientSnaps for test
HaseProgram May 31, 2018
2390efc
last fix
HustonMmmavr May 31, 2018
c559a5a
added client snapshot and old snapshot deletes
HustonMmmavr Jun 1, 2018
aeee8b3
added scores
HustonMmmavr Jun 1, 2018
bcd96b1
fixed scores and lobby
HustonMmmavr Jun 1, 2018
13a6492
some fixes
HustonMmmavr Jun 1, 2018
7db6b4f
added
HustonMmmavr Jun 1, 2018
548d9f2
4players lobby
HaseProgram Jun 1, 2018
cc66371
Lobby update fix
HaseProgram Jun 1, 2018
497c082
lobby fix
HustonMmmavr Jun 1, 2018
6948454
lobby fix and checkstyle
HustonMmmavr Jun 1, 2018
6c0f195
fixed onelobbyinfo
HustonMmmavr Jun 2, 2018
ee4e96d
fixed romove user
HustonMmmavr Jun 2, 2018
512a401
Lobby fix
HaseProgram Jun 2, 2018
08e50b0
cs
HaseProgram Jun 2, 2018
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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.0.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>9</java.version>
<java.version>10</java.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

с этим могут возникнуть проблемы на heroku и travic CI

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ну хоть var заиспользуйте где-нибудь. А то зачем подключали? =(
https://developer.oracle.com/java/jdk-10-local-variable-type-inference

</properties>

<dependencies>
Expand Down