Commit Graph

113 Commits

Author SHA1 Message Date
a5ec342005 Fix empty room bug 2021-06-18 08:55:55 +02:00
ae4d7085ba Removed unused files 2021-06-18 08:37:10 +02:00
Fabian Thome
559336fb65
player movement
- changed direction of gameplay (now clockwise)
- renamed player variables
2021-06-17 19:57:32 +02:00
Thorsten Rausch
ae82565bbe fix missing broadcast "user left" 2021-06-17 19:22:36 +02:00
Thorsten Rausch
aa97939037 Merge branch 'logic' into player-movement
# Conflicts:
#	Webservice/Player.js
2021-06-17 19:08:37 +02:00
Thorsten Rausch
d60b97a112 Merge remote-tracking branch 'origin/player-movement' into player-movement 2021-06-17 18:59:43 +02:00
Fabian Thome
7011f773a5
player movement
- notice 'player moved'
- added fourth player
- added colors for players
- remove players & add new players at new position
2021-06-17 18:51:23 +02:00
Fabian Thome
e85e66444c
emit 'player moved' 2021-06-17 18:49:31 +02:00
Thorsten Rausch
8f30d63b03 add methods to Game to access players by name 2021-06-17 18:33:16 +02:00
Fabian Thome
dffb1ce516
player movement 2021-06-17 17:23:53 +02:00
Florian Kaiser
be4968bb07
Merge pull request #36 from H4CK3R-01/fix_server
Next try
2021-06-17 10:43:15 +02:00
c0c3a447ef Next try 2021-06-17 10:38:46 +02:00
Florian Kaiser
7c8cc11068
Merge pull request #35 from H4CK3R-01/fix_server
Try to fix server
2021-06-17 10:02:23 +02:00
d4cc2b9ee3 Try to fix server 2021-06-17 10:01:11 +02:00
Florian Kaiser
b156c8566b
Merge pull request #34 from H4CK3R-01/extract_classes_from_main_file
Extracted classes from server.js
2021-06-17 08:46:15 +02:00
53d6809baa Extracted classes from server.js 2021-06-17 08:45:45 +02:00
Florian Kaiser
b87080c20a
Merge pull request #33 from H4CK3R-01/fix_only_one_room_bug
Create several rooms now
2021-06-17 08:35:51 +02:00
f9233bdc55 Create several rooms now 2021-06-17 08:35:14 +02:00
Florian Kaiser
35da8d56bb
Merge pull request #32 from H4CK3R-01/logic
Logic
2021-06-16 11:00:52 +02:00
Thorsten Rausch
d192de26db Merge remote-tracking branch 'origin/main' into logic 2021-06-16 10:48:12 +02:00
Thorsten Rausch
d60bbbcf7d make gameState a class 2021-06-16 10:44:21 +02:00
Florian Kaiser
bef6e0bc96
Merge pull request #31 from H4CK3R-01/generate_minimized_files
Minimize js and css files in docker build
2021-06-16 10:16:44 +02:00
ef52806366 Minimize js and css files in docker build 2021-06-16 10:15:48 +02:00
Thorsten Rausch
f022f17186 implement hunter 2021-06-16 00:06:00 +02:00
Thorsten Rausch
4674720cfb fix players moving when answers are wrong 2021-06-15 18:38:55 +02:00
Thorsten Rausch
c243138b87 implement player class with player movement 2021-06-15 18:18:16 +02:00
Thorsten Rausch
2ac1733251 Merge branch 'main' into logic
# Conflicts:
#	public/js/game.js
2021-06-15 17:42:42 +02:00
Thorsten Rausch
10e69084bc reorder sprites 2021-06-15 17:37:42 +02:00
H4CK3R-01
1e0f6aa4fe
Merge pull request #30 from H4CK3R-01/design_fix
Small fixes
2021-06-15 08:59:44 +02:00
ea67ff8c95 - Fixed line breaks in questions and answers
- Updated pixi.js and socket.io-admin-ui
2021-06-15 08:59:05 +02:00
H4CK3R-01
9d45101c9f
Merge pull request #29 from H4CK3R-01/design_fix
Fixed long questions and answers
2021-06-15 08:46:56 +02:00
566c03d33a Fixed long questions and answers 2021-06-14 13:14:16 +02:00
H4CK3R-01
aa6d67fd33
Merge pull request #28 from H4CK3R-01/multiplayer
Fixed multiplayer
2021-06-14 12:30:33 +02:00
5276377393 Fixed multiplayer 2021-06-14 12:29:38 +02:00
H4CK3R-01
3644bbec52
Merge pull request #27 from H4CK3R-01/multiplayer
- Added multiplayer functions
2021-06-14 12:08:31 +02:00
H4CK3R-01
59b353741f
Merge branch 'main' into multiplayer 2021-06-14 12:08:02 +02:00
00d868f963 Destroy text and borders 2021-06-14 12:06:49 +02:00
H4CK3R-01
9bd17accda
Merge pull request #26 from H4CK3R-01/fix_resize_bug
Buttons work now on mobile devices
2021-06-11 10:18:14 +02:00
997e7a0f89 Buttons work now on mobile devices 2021-06-11 10:17:38 +02:00
H4CK3R-01
4167ad06f3
Merge pull request #25 from H4CK3R-01/fix_resize_bug
Fixed resize bug
2021-06-11 10:08:06 +02:00
0680930f78 Fixed resize bug 2021-06-11 10:07:38 +02:00
H4CK3R-01
69ca6138ef
Merge pull request #24 from H4CK3R-01/fix_chat_scrolling
Automatically scroll down if new message is displayed
2021-06-11 09:34:59 +02:00
34287bca54 Automatically scroll down if new message is displayed 2021-06-11 09:34:34 +02:00
H4CK3R-01
7ed474d493
Merge pull request #23 from H4CK3R-01/update_readme
Fixed typo
2021-06-11 09:30:17 +02:00
b53ffef5ce Fixed typo 2021-06-11 09:29:55 +02:00
H4CK3R-01
c19d09d6d5
Merge pull request #22 from H4CK3R-01/update_readme
Updated README.md
2021-06-11 09:25:04 +02:00
fe4ef244f8 Updated README.md 2021-06-11 09:24:40 +02:00
H4CK3R-01
9e929b1786
Merge pull request #21 from H4CK3R-01/chat_fix
Send message on pressing enter
2021-06-11 08:50:58 +02:00
e618c20dc8 Send message on pressing enter 2021-06-11 08:50:00 +02:00
H4CK3R-01
f1d053bf29
Merge pull request #20 from H4CK3R-01/reformatting
Reformatted code
2021-06-11 07:59:36 +02:00