Commits · 80cad7a8b660afed7aa5b08a360b1318cd7f5250 · RUNZHE WANG / COMP90015-DSAss2-InfinityMonkeys-remaster

Browse files

Oct 24, 2019
- Merge branch 'hai' into 'master' · 80cad7a8
  Ho Dac Hai authored Oct 24, 2019
  80cad7a8
- fixed GUI layout · 025629b0
  Hai HoDac authored Oct 24, 2019
  025629b0
- Merge branch 'hai' into 'master' · 2d99e358
  Ho Dac Hai authored Oct 24, 2019
  2d99e358
- fixed notifyUserDrawing exception · f78c86e4
  Hai HoDac authored Oct 24, 2019
  
  f78c86e4
- Merge branch 'hai' into 'master' · fbdba5d2
  Ho Dac Hai authored Oct 24, 2019
  fbdba5d2
- Merged · 0145a574
  Hai HoDac authored Oct 24, 2019
  
  0145a574
- Merge branch 'hai' into 'master' · 78d0b929
  Ho Dac Hai authored Oct 24, 2019
  78d0b929
- Merged · d1bb42c9
  Hai HoDac authored Oct 24, 2019
  
  d1bb42c9
- Merge branch 'hai' into 'master' · 44360555
  Ho Dac Hai authored Oct 24, 2019
  44360555
- Merged with Isaac's code · 5689f505
  Hai HoDac authored Oct 24, 2019
  5689f505
- Some merge bugs fixed · 494bb0d8
  Pedroza Aguirre Isaac authored Oct 24, 2019
  
  494bb0d8
- Merged with Ryan's code · 9afac890
  Hai HoDac authored Oct 24, 2019
  
  9afac890
- Merge branch 'master' of... · 6f42314c
  Pedroza Aguirre Isaac authored Oct 24, 2019
  6f42314c
- Merging master with isaac code · f889c4da
  Pedroza Aguirre Isaac authored Oct 24, 2019
  
  f889c4da
- fix communication issue & invisible text issue · 8c95a987
  Chang Che Hao authored Oct 24, 2019
  
  View commits for tag rmi-working-before-merging-with-isaac rmi-working-before-merging-with-isaac
  
  8c95a987
- commit to checkout · f18f5e86
  Pedroza Aguirre Isaac authored Oct 24, 2019
  
  f18f5e86
- Admin functions · 380495a6
  Pedroza Aguirre Isaac authored Oct 24, 2019
  
  380495a6
- Merge branch 'hai' into 'master' · 4c8f7761
  Ho Dac Hai authored Oct 24, 2019
  4c8f7761
- Merge branch 'master' into 'hai' · 2a55efad
  Ho Dac Hai authored Oct 24, 2019
  2a55efad
- Merged with Ryan's code · 5fc735fe
  Hai HoDac authored Oct 24, 2019
  
  5fc735fe
- fix text drawing issue · 7944c819
  Chang Che Hao authored Oct 24, 2019
  
  7944c819
- "new file" button - works · 9888279f
  Hai HoDac authored Oct 24, 2019
  
  9888279f
- Admin functions changes · 2969ca84
  Pedroza Aguirre Isaac authored Oct 24, 2019
  
  2969ca84
- "new file" button - works · e807c965
  Hai HoDac authored Oct 24, 2019
  
  e807c965
- open file - works · 18d3ce6b
  Hai HoDac authored Oct 24, 2019
  
  18d3ce6b
- fix smoothness issue · 7489c06d
  Chang Che Hao authored Oct 24, 2019
  
  7489c06d
- fix smoothness issue · 4f67ec36
  Chang Che Hao authored Oct 24, 2019
  
  4f67ec36
Oct 23, 2019
- open file - debugging · ff98d287
  Hai HoDac authored Oct 23, 2019
  
  ff98d287
- Merge branch 'isaac' of... · 32dc06cd
  Pedroza Aguirre Isaac authored Oct 23, 2019
  32dc06cd
- ADD: admin functions when manager quits · 6341fefb
  Pedroza Aguirre Isaac authored Oct 23, 2019
  
  6341fefb
- fix drawing bug · a258c2a6
  Chang Che Hao authored Oct 23, 2019
  
  a258c2a6
- 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