Commits · a7f22c0e13ae589e21b71f95b33893710a6baef1 · Ho Dac Hai / COMP90015-DSAss2-InfinityMonkeys-remaster

Browse files

Oct 24, 2019
- Merge branch 'Eldar' of... · a7f22c0e
  Eldar Kurmakaev authored Oct 24, 2019
  a7f22c0e
- no message · fa16efae
  Eldar Kurmakaev authored Oct 24, 2019
  
  fa16efae
Oct 23, 2019
- Merge branch 'master' of... · e727af46
  Eldar Kurmakaev authored Oct 23, 2019
  e727af46
- jj · 0da606bf
  Eldar Kurmakaev authored Oct 23, 2019
  
  0da606bf
- Merge branch 'hai' into 'master' · 4e55034e
  Ho Dac Hai authored Oct 23, 2019
  4e55034e
- update startScreen · 4f8b919a
  Hai HoDac authored Oct 23, 2019
  
  4f8b919a
- Merge branch 'hai' into 'master' · 75a82d52
  Ho Dac Hai authored Oct 23, 2019
  75a82d52
- Merged encryption function 2 · ad7174e1
  Hai HoDac authored Oct 23, 2019
  
  ad7174e1
- Merged encryption function · 0a87bda0
  Hai HoDac authored Oct 23, 2019
  
  0a87bda0
- commit · 38aee1e5
  Hai HoDac authored Oct 23, 2019
  
  38aee1e5
- stroke description changed & eraser bug fixed · 45627a40
  Chang Che Hao authored Oct 23, 2019
  
  45627a40
- Merge branch 'hai' into 'master' · 121c616c
  Ho Dac Hai authored Oct 23, 2019
  121c616c
- Merge branch 'master' into 'hai' · 29908e28
  Ho Dac Hai authored Oct 23, 2019
  29908e28
- PaintGUI · 9cfb4f1b
  Hai HoDac authored Oct 23, 2019
  9cfb4f1b
- startScreen · ed66273a
  Hai HoDac authored Oct 23, 2019
  
  ed66273a
- Fixed auto scale chat window / admin tool window when assign other member as manager. (ChatScreen) · 7189c58b
  Hai HoDac authored Oct 23, 2019
  7189c58b
- Merge branch 'hai' into 'master' · cdea11be
  Ho Dac Hai authored Oct 23, 2019
  cdea11be
- Fixed auto scale chat window / admin tool window when assign other member as manager. (ChatScreen) · 206b08c2
  Hai HoDac authored Oct 23, 2019
  206b08c2
- Changed the join method to send over a reference of the ClientUpdate Interface · 9baba739
  Eldar Kurmakaev authored Oct 23, 2019
  
  9baba739
Oct 22, 2019
- Merge branch 'hai' into 'master' · 6788b93f
  Ho Dac Hai authored Oct 22, 2019
  View commits for tag all-code-merged-by-hai-v1 all-code-merged-by-hai-v1
  
  6788b93f
- Load previous GUI (without text) · 5f3c35d7
  Hai HoDac authored Oct 22, 2019
  5f3c35d7
- Merge branch 'hai' into 'master' · 9ef192b7
  Ho Dac Hai authored Oct 22, 2019
  9ef192b7
- new GUI · 769db637
  Hai HoDac authored Oct 22, 2019
  769db637
- Merge branch 'hai' into 'master' · ba6a008a
  Ho Dac Hai authored Oct 22, 2019
  ba6a008a
- new GUI · d1ed051f
  Hai HoDac authored Oct 22, 2019
  d1ed051f
- Merge branch 'hai' into 'master' · eb10b2ca
  Ho Dac Hai authored Oct 22, 2019
  eb10b2ca
- All works so far · 5c71fbd4
  Hai HoDac authored Oct 22, 2019
  
  5c71fbd4
- All works so far · b4793fc9
  Hai HoDac authored Oct 22, 2019
  
  b4793fc9
- Solving conflicts with Max changes · c35150cb
  Pedroza Aguirre Isaac authored Oct 22, 2019
  
  c35150cb
- Solving conflicts merging with previous master · 663ace1b
  Pedroza Aguirre Isaac authored Oct 22, 2019
  
  663ace1b
- latest from Max · 319c99e6
  mpriymak authored Oct 22, 2019
  
  319c99e6
- latest code from Max · 987f7861
  mpriymak authored Oct 22, 2019
  
  987f7861
- Merge remote-tracking branch 'origin/master' · 43e65613
  mpriymak authored Oct 22, 2019
  43e65613
- Changed the join method to send over a reference of the ClientUpdate Interface · 1059bfd0
  mpriymak authored Oct 22, 2019
  
  1059bfd0
- Changed the join method to send over a reference of the ClientUpdate Interface · 6d57ec7b
  mpriymak authored Oct 22, 2019
  
  6d57ec7b
- Solving conflicts · a9add351
  Pedroza Aguirre Isaac authored Oct 22, 2019
  
  a9add351
- Implementation of Admin Functions: Kick Out and Assign Admin · 45792ea2
  Pedroza Aguirre Isaac authored Oct 22, 2019
  
  45792ea2
- Merge branch 'master' of... · 61fd80ff
  Eldar Kurmakaev authored Oct 22, 2019
  61fd80ff
Oct 21, 2019
- Merge branch 'mpriymak' into 'master' · 0e31242f
  Maxim Priymak authored Oct 21, 2019
  0e31242f
- Merge branch 'master' into 'mpriymak' · 2c0912c8
  Maxim Priymak authored Oct 21, 2019
  2c0912c8