Commit Graph

Select branches

Hide Pull Requests

fix_backend

main

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

2ccea97

4eb1fed

eadf325

Mono Color

• 9d0f804c28
  Merge pull request #39 from H4CK3R-01/fix_chat Florian Kaiser 2021-06-18 13:19:24 +02:00
• 9a37f674b3 fixed duplicate messages H4CK3R-01 2021-06-18 13:18:25 +02:00
• 0e4fd19933 make WIN_POSITION a static member Thorsten Rausch 2021-06-18 13:06:41 +02:00
• 494109de79 add Game.currentState to indicate whether games are won/lost Thorsten Rausch 2021-06-18 13:03:25 +02:00
• 60adfc1e49
  Merge pull request #38 from H4CK3R-01/player-movement Florian Kaiser 2021-06-18 10:20:22 +02:00
• 0287f8aec0 Error if game already started or more than 4 players H4CK3R-01 2021-06-18 10:19:03 +02:00
• 73ced0222f - Refactoring - Show which player is active H4CK3R-01 2021-06-18 09:43:40 +02:00
• f4d9804100 - Added TODO - Fix Bug if active player leaves H4CK3R-01 2021-06-18 09:09:50 +02:00
• 6ca95e697c Improved positioning of players H4CK3R-01 2021-06-18 08:56:31 +02:00
• a5ec342005 Fix empty room bug H4CK3R-01 2021-06-18 08:55:55 +02:00
• ae4d7085ba Removed unused files H4CK3R-01 2021-06-18 08:37:10 +02:00
• 559336fb65
  player movement Fabian Thome 2021-06-17 19:57:32 +02:00
• ae82565bbe fix missing broadcast "user left" Thorsten Rausch 2021-06-17 19:22:36 +02:00
• aa97939037 Merge branch 'logic' into player-movement Thorsten Rausch 2021-06-17 19:02:58 +02:00
• d60b97a112 Merge remote-tracking branch 'origin/player-movement' into player-movement Thorsten Rausch 2021-06-17 18:59:43 +02:00
• 7011f773a5
  player movement Fabian Thome 2021-06-17 18:51:23 +02:00
• e85e66444c
  emit 'player moved' Fabian Thome 2021-06-17 18:49:31 +02:00
• 8f30d63b03 add methods to Game to access players by name Thorsten Rausch 2021-06-17 18:33:16 +02:00
• dffb1ce516
  player movement Fabian Thome 2021-06-17 17:23:53 +02:00
• be4968bb07
  Merge pull request #36 from H4CK3R-01/fix_server Florian Kaiser 2021-06-17 10:43:15 +02:00
• c0c3a447ef Next try H4CK3R-01 2021-06-17 10:38:46 +02:00
• 7c8cc11068
  Merge pull request #35 from H4CK3R-01/fix_server Florian Kaiser 2021-06-17 10:02:23 +02:00
• d4cc2b9ee3 Try to fix server H4CK3R-01 2021-06-17 10:01:11 +02:00
• b156c8566b
  Merge pull request #34 from H4CK3R-01/extract_classes_from_main_file Florian Kaiser 2021-06-17 08:46:15 +02:00
• 53d6809baa Extracted classes from server.js H4CK3R-01 2021-06-17 08:45:45 +02:00
• b87080c20a
  Merge pull request #33 from H4CK3R-01/fix_only_one_room_bug Florian Kaiser 2021-06-17 08:35:51 +02:00
• f9233bdc55 Create several rooms now H4CK3R-01 2021-06-17 08:35:14 +02:00
• 35da8d56bb
  Merge pull request #32 from H4CK3R-01/logic Florian Kaiser 2021-06-16 11:00:52 +02:00
• d192de26db Merge remote-tracking branch 'origin/main' into logic Thorsten Rausch 2021-06-16 10:48:12 +02:00
• d60bbbcf7d make gameState a class Thorsten Rausch 2021-06-16 10:44:21 +02:00
• bef6e0bc96
  Merge pull request #31 from H4CK3R-01/generate_minimized_files Florian Kaiser 2021-06-16 10:16:44 +02:00
• ef52806366 Minimize js and css files in docker build H4CK3R-01 2021-06-16 10:15:48 +02:00
• f022f17186 implement hunter Thorsten Rausch 2021-06-16 00:06:00 +02:00
• 4674720cfb fix players moving when answers are wrong Thorsten Rausch 2021-06-15 18:38:55 +02:00
• c243138b87 implement player class with player movement Thorsten Rausch 2021-06-15 18:18:16 +02:00
• 2ac1733251 Merge branch 'main' into logic Thorsten Rausch 2021-06-15 17:42:42 +02:00
• 10e69084bc reorder sprites Thorsten Rausch 2021-06-15 17:37:42 +02:00
• 1e0f6aa4fe
  Merge pull request #30 from H4CK3R-01/design_fix H4CK3R-01 2021-06-15 08:59:44 +02:00
• ea67ff8c95 - Fixed line breaks in questions and answers - Updated pixi.js and socket.io-admin-ui H4CK3R-01 2021-06-15 08:59:05 +02:00
• 9d45101c9f
  Merge pull request #29 from H4CK3R-01/design_fix H4CK3R-01 2021-06-15 08:46:56 +02:00
• 566c03d33a Fixed long questions and answers H4CK3R-01 2021-06-14 13:14:16 +02:00
• aa6d67fd33
  Merge pull request #28 from H4CK3R-01/multiplayer H4CK3R-01 2021-06-14 12:30:33 +02:00
• 5276377393 Fixed multiplayer H4CK3R-01 2021-06-14 12:29:38 +02:00
• 3644bbec52
  Merge pull request #27 from H4CK3R-01/multiplayer H4CK3R-01 2021-06-14 12:08:31 +02:00
• 59b353741f
  Merge branch 'main' into multiplayer H4CK3R-01 2021-06-14 12:08:02 +02:00
• 00d868f963 Destroy text and borders H4CK3R-01 2021-06-14 12:06:49 +02:00
• 9bd17accda
  Merge pull request #26 from H4CK3R-01/fix_resize_bug H4CK3R-01 2021-06-11 10:18:14 +02:00
• 997e7a0f89 Buttons work now on mobile devices H4CK3R-01 2021-06-11 10:17:38 +02:00
• 4167ad06f3
  Merge pull request #25 from H4CK3R-01/fix_resize_bug H4CK3R-01 2021-06-11 10:08:06 +02:00
• 0680930f78 Fixed resize bug H4CK3R-01 2021-06-11 10:07:38 +02:00
• 69ca6138ef
  Merge pull request #24 from H4CK3R-01/fix_chat_scrolling H4CK3R-01 2021-06-11 09:34:59 +02:00
• 34287bca54 Automatically scroll down if new message is displayed H4CK3R-01 2021-06-11 09:34:34 +02:00
• 7ed474d493
  Merge pull request #23 from H4CK3R-01/update_readme H4CK3R-01 2021-06-11 09:30:17 +02:00
• b53ffef5ce Fixed typo H4CK3R-01 2021-06-11 09:29:55 +02:00
• c19d09d6d5
  Merge pull request #22 from H4CK3R-01/update_readme H4CK3R-01 2021-06-11 09:25:04 +02:00
• fe4ef244f8 Updated README.md H4CK3R-01 2021-06-11 09:24:40 +02:00
• 9e929b1786
  Merge pull request #21 from H4CK3R-01/chat_fix H4CK3R-01 2021-06-11 08:50:58 +02:00
• e618c20dc8 Send message on pressing enter H4CK3R-01 2021-06-11 08:50:00 +02:00
• f1d053bf29
  Merge pull request #20 from H4CK3R-01/reformatting H4CK3R-01 2021-06-11 07:59:36 +02:00
• 065184bea8 Reformatted code H4CK3R-01 2021-06-11 07:55:46 +02:00
• 88300c1be2 Merge branch 'main' of https://github.com/H4CK3R-01/Projektmanagement-Game into main koenigmarcel 2021-06-10 20:32:21 +02:00
• e5d1fc77d1 + added mobileHandler.js and mobile.css prototype to handle mobile devices koenigmarcel 2021-06-10 20:32:16 +02:00
• fb3646e99d
  Merge pull request #19 from H4CK3R-01/monitoring_functions H4CK3R-01 2021-06-10 20:27:26 +02:00
• e5c8e169b2 Fixed server.js on local environments H4CK3R-01 2021-06-10 20:27:04 +02:00
• 3773fb427b
  Merge pull request #18 from H4CK3R-01/monitoring_functions H4CK3R-01 2021-06-10 19:53:22 +02:00
• b06ba29bce Added monitoring functions H4CK3R-01 2021-06-10 19:52:32 +02:00
• c4c1fad1cb
  Merge pull request #17 from H4CK3R-01/fix_onbeforeunload_bug H4CK3R-01 2021-06-10 16:28:04 +02:00
• 28c9ccf5be Disconnect only if user confirms H4CK3R-01 2021-06-10 16:27:32 +02:00
• aa0e6dd448
  Merge pull request #16 from H4CK3R-01/version_number H4CK3R-01 2021-06-10 16:14:10 +02:00
• 8908316254 Replace placeholder in Dockerfile H4CK3R-01 2021-06-10 16:13:42 +02:00
• b7ca3ece8c
  Merge pull request #15 from H4CK3R-01/version_number H4CK3R-01 2021-06-10 15:29:57 +02:00
• 3f3de8337c Improved HTML for sed H4CK3R-01 2021-06-10 15:29:37 +02:00
• 99d1682898
  Merge pull request #14 from H4CK3R-01/version_number H4CK3R-01 2021-06-10 15:18:48 +02:00
• cacd08c065 - Added space for build date and commit H4CK3R-01 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 H4CK3R-01 2021-06-10 14:05:01 +02:00
• 8bfe36ba77
  Merge pull request #13 from H4CK3R-01/convert_json H4CK3R-01 2021-06-10 12:56:29 +02:00
• 0a55ef7db8 - Use real questions now - Convert JSON to other format H4CK3R-01 2021-06-10 12:45:56 +02:00
• d47ca1be66
  Merge pull request #12 from H4CK3R-01/fix_scale_problem H4CK3R-01 2021-06-10 11:31:01 +02:00
• 502339d90b Fixed scale problem H4CK3R-01 2021-06-10 11:27:51 +02:00
• dd34403a3e hunter now kills players behind itself Thorsten Rausch 2021-06-10 10:21:45 +02:00
• bc6d839294 add player and hunter class Thorsten Rausch 2021-06-10 10:09:16 +02:00
• dc1af4eae6
  Merge pull request #11 from H4CK3R-01/logo H4CK3R-01 2021-06-09 14:16:30 +02:00
• f5f4491704 Added logo H4CK3R-01 2021-06-09 14:16:08 +02:00
• ef2c514ce4
  Merge pull request #10 from H4CK3R-01/dice H4CK3R-01 2021-06-09 14:12:12 +02:00
• 6de03184f4 Implement dice H4CK3R-01 2021-06-09 14:11:47 +02:00
• d47456c184
  Merge pull request #9 from H4CK3R-01/load_card_from_server_and_display_it H4CK3R-01 2021-06-08 17:34:20 +02:00
• f469259d36 Get card data from server and display it H4CK3R-01 2021-06-08 17:33:59 +02:00
• d81bbd03c8
  Merge pull request #8 from H4CK3R-01/fix_dockerfile H4CK3R-01 2021-06-08 16:17:10 +02:00
• a367a183e7 Fixed dockerfile H4CK3R-01 2021-06-08 16:16:55 +02:00
• d867586a71 - fixed merge conflict H4CK3R-01 2021-06-08 16:02:37 +02:00
• d5504c631e Merge branch 'game_backend' into development H4CK3R-01 2021-06-08 15:59:33 +02:00
• a7a509e121 Merge branch 'game_board' into development H4CK3R-01 2021-06-08 15:58:58 +02:00
• 948529818b - added function to get random number and card H4CK3R-01 2021-06-08 15:58:32 +02:00
• af47c15287 - Load game_board only if user is logged in H4CK3R-01 2021-06-08 15:55:33 +02:00
• 2c7556cbe7 - Game board - cards - landing page H4CK3R-01 2021-06-08 15:38:43 +02:00
• 98177f6b5b
  Merge pull request #4 from H4CK3R-01/update_readme H4CK3R-01 2021-06-08 08:01:07 +02:00
• 675b1339fc Updated README.md H4CK3R-01 2021-06-08 08:00:51 +02:00
• 70f1dbc492
  Merge pull request #3 from H4CK3R-01/revert-2-update_readme H4CK3R-01 2021-06-08 07:58:57 +02:00
• d87b131a80
  Revert "Update readme" H4CK3R-01 2021-06-08 07:58:46 +02:00
• 6f2aa2c682
  Merge pull request #2 from H4CK3R-01/update_readme H4CK3R-01 2021-06-07 22:07:34 +02:00