Commit Graph

52 Commits

Author SHA1 Message Date
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
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
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
f469259d36 Get card data from server and display it 2021-06-08 17:33:59 +02:00
H4CK3R-01
d81bbd03c8
Merge pull request #8 from H4CK3R-01/fix_dockerfile
Fixed dockerfile
2021-06-08 16:17:10 +02:00
a367a183e7 Fixed dockerfile 2021-06-08 16:16:55 +02:00
d867586a71 - fixed merge conflict 2021-06-08 16:02:37 +02:00
d5504c631e Merge branch 'game_backend' into development
# Conflicts:
#	public/js/game.js
2021-06-08 15:59:33 +02:00
a7a509e121 Merge branch 'game_board' into development 2021-06-08 15:58:58 +02:00
948529818b - added function to get random number and card 2021-06-08 15:58:32 +02:00
af47c15287 - Load game_board only if user is logged in 2021-06-08 15:55:33 +02:00
2c7556cbe7 - Game board
- cards
- landing page
2021-06-08 15:38:43 +02:00
H4CK3R-01
98177f6b5b
Merge pull request #4 from H4CK3R-01/update_readme
Updated README.md
2021-06-08 08:01:07 +02:00
675b1339fc Updated README.md 2021-06-08 08:00:51 +02:00
H4CK3R-01
70f1dbc492
Merge pull request #3 from H4CK3R-01/revert-2-update_readme
Revert "Update readme"
2021-06-08 07:58:57 +02:00
H4CK3R-01
d87b131a80
Revert "Update readme" 2021-06-08 07:58:46 +02:00
H4CK3R-01
6f2aa2c682
Merge pull request #2 from H4CK3R-01/update_readme
Update readme
2021-06-07 22:07:34 +02:00
934592468d Updated README.md 2021-06-07 22:07:02 +02:00
a2cbb934e6 - Cards, Buttons and Sprites are Objects now
- Reformatting, Refactoring
2021-06-07 22:01:23 +02:00
f04f07fdca - Added username and room input
- Reformatting
2021-06-07 19:23:53 +02:00
678d6f8eb7 - Fixed resizing
- Optimized colors
- Fixed click listener
2021-06-06 22:27:14 +02:00
c4c2b34c08 - Card functionality
- landing page
2021-06-06 21:24:15 +02:00
3fe1fbccb4 - Added card stacks
- Added 'ok'-button on card view
- Resize white circles and red border
- Upgraded pixi.js from 5.1.3 to 6.0.4
- Refactoring
2021-06-05 17:46:31 +02:00
83855f9acd - CSS background instead of pixi.js background
- Refactoring pixi.js code
- Resize game board on browser resize
2021-06-01 13:24:52 +02:00
bd70508b29 Initial commit of game board 2021-05-31 21:42:33 +02:00
H4CK3R-01
6812036bfd
Merge pull request #1 from H4CK3R-01/fix_chat_bug
Fixed undefined string bug in pad-function
2021-05-31 11:41:35 +02:00
5597680526 Fixed undefined string bug in pad-function 2021-05-31 11:40:02 +02:00
5aa0b95034 Some small fixes 2021-05-26 22:58:00 +02:00
50327dfffc - Added chat room function
- improved logs
2021-05-26 22:41:05 +02:00
b911164db2 Refactored and cleaned up 2021-05-26 19:35:07 +02:00
05b85f2d4e Test pipeline (2) 2021-05-26 17:22:03 +02:00
cb2be52815 Test pipeline 2021-05-26 17:13:30 +02:00
a1a75fffdb Added package.json 2021-05-26 17:10:14 +02:00
0381650c66 Added Dockerfile 2021-05-26 16:59:19 +02:00
6f62883275 chat functions 2021-05-26 16:26:05 +02:00
18ccd51749 Fixed material icon 2021-05-20 20:31:54 +02:00
4a4bdfad16 Initial file structure 2021-05-20 19:58:24 +02:00