Commit Graph

136 Commits

Author SHA1 Message Date
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
065184bea8 Reformatted code 2021-06-11 07:55:46 +02:00
koenigmarcel
88300c1be2 Merge branch 'main' of https://github.com/H4CK3R-01/Projektmanagement-Game into main 2021-06-10 20:32:21 +02:00
koenigmarcel
e5d1fc77d1 + added mobileHandler.js and mobile.css prototype to handle mobile devices 2021-06-10 20:32:16 +02:00
H4CK3R-01
fb3646e99d
Merge pull request #19 from H4CK3R-01/monitoring_functions
Fixed server.js on local environments
2021-06-10 20:27:26 +02:00
e5c8e169b2 Fixed server.js on local environments 2021-06-10 20:27:04 +02:00
H4CK3R-01
3773fb427b
Merge pull request #18 from H4CK3R-01/monitoring_functions
Added monitoring functions
2021-06-10 19:53:22 +02:00
b06ba29bce Added monitoring functions 2021-06-10 19:52:32 +02:00
H4CK3R-01
c4c1fad1cb
Merge pull request #17 from H4CK3R-01/fix_onbeforeunload_bug
Disconnect only if user confirms
2021-06-10 16:28:04 +02:00
28c9ccf5be Disconnect only if user confirms 2021-06-10 16:27:32 +02:00
H4CK3R-01
aa0e6dd448
Merge pull request #16 from H4CK3R-01/version_number
Replace placeholder in Dockerfile
2021-06-10 16:14:10 +02:00
8908316254 Replace placeholder in Dockerfile 2021-06-10 16:13:42 +02:00
H4CK3R-01
b7ca3ece8c
Merge pull request #15 from H4CK3R-01/version_number
Improved HTML for sed
2021-06-10 15:29:57 +02:00
3f3de8337c Improved HTML for sed 2021-06-10 15:29:37 +02:00
H4CK3R-01
99d1682898
Merge pull request #14 from H4CK3R-01/version_number
space for build date and commit
2021-06-10 15:18:48 +02:00
cacd08c065 - Added space for build date and commit 2021-06-10 15:17:19 +02:00
c4a8c84db2 - Added multiplayer functions
- Only active user can roll the dice
- Only active user can select answers
- Card will be destroyed if active user selects answer
2021-06-10 14:05:01 +02:00
H4CK3R-01
8bfe36ba77
Merge pull request #13 from H4CK3R-01/convert_json
Updated Questions
2021-06-10 12:56:29 +02:00
0a55ef7db8 - Use real questions now
- Convert JSON to other format
2021-06-10 12:45:56 +02:00
H4CK3R-01
d47ca1be66
Merge pull request #12 from H4CK3R-01/fix_scale_problem
Fixed scale problem
2021-06-10 11:31:01 +02:00
502339d90b Fixed scale problem 2021-06-10 11:27:51 +02:00
Thorsten Rausch
dd34403a3e hunter now kills players behind itself 2021-06-10 10:21:45 +02:00
Thorsten Rausch
bc6d839294 add player and hunter class 2021-06-10 10:09:16 +02:00
H4CK3R-01
dc1af4eae6
Merge pull request #11 from H4CK3R-01/logo
Added logo
2021-06-09 14:16:30 +02:00
f5f4491704 Added logo 2021-06-09 14:16:08 +02:00
H4CK3R-01
ef2c514ce4
Merge pull request #10 from H4CK3R-01/dice
Implement dice
2021-06-09 14:12:12 +02:00
6de03184f4 Implement dice 2021-06-09 14:11:47 +02:00
H4CK3R-01
d47456c184
Merge pull request #9 from H4CK3R-01/load_card_from_server_and_display_it
Get card data from server and display it
2021-06-08 17:34:20 +02:00