Commits · 040ddf7b52a1acf41633e310a4e03004e02de275 · RUNZHE WANG / COMP90015-DSAss2-InfinityMonkeys-remaster

Browse files

Oct 25, 2019
- Fixed merging bugs · 040ddf7b
  Pedroza Aguirre Isaac authored Oct 25, 2019
  
  040ddf7b
- Merging isaac's code with master, conflicts solved · 59c5f2a9
  Pedroza Aguirre Isaac authored Oct 25, 2019
  
  59c5f2a9
- ADD: kickout and new admin pop-up · 90e5225e
  Pedroza Aguirre Isaac authored Oct 25, 2019
  
  90e5225e
- Join Approval and pop-ups · 6832e47e
  Pedroza Aguirre Isaac authored Oct 25, 2019
  
  6832e47e
- Merge branch 'master' of... · 19305992
  Eldar Kurmakaev authored Oct 25, 2019
  View commits for tag master-before-merging-with-isaac master-before-merging-with-isaac
  
  19305992
- Changed the join method to send over a reference of the ClientUpdate Interface · a7bbd48f
  Eldar Kurmakaev authored Oct 25, 2019
  
  a7bbd48f
- Changed the join method to send over a reference of the ClientUpdate Interface · 08f4e6d3
  Eldar Kurmakaev authored Oct 25, 2019
  
  08f4e6d3
- Merge branch 'hai' into 'master' · 9e5c888c
  Ho Dac Hai authored Oct 25, 2019
  9e5c888c
- Client: · f4f4b9dc
  Hai HoDac authored Oct 25, 2019
  f4f4b9dc
- Restrict username to <= 15 characters. · fd9c6a61
  Hai HoDac authored Oct 25, 2019
  fd9c6a61
Oct 24, 2019
- Merge branch 'hai' into 'master' · d143d6ad
  Ho Dac Hai authored Oct 24, 2019
  d143d6ad
- fixed dragging line stroke · 7a1d5044
  Hai HoDac authored Oct 24, 2019
  7a1d5044
- 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 'master' of... · f3c6bf2e
  Eldar Kurmakaev authored Oct 24, 2019
  f3c6bf2e
- no message · 9ffe3562
  Eldar Kurmakaev authored Oct 24, 2019
  
  9ffe3562
- 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
- Pop-ups bug fixed and exitbutton updated · a4d74623
  Pedroza Aguirre Isaac authored Oct 24, 2019
  
  a4d74623
- 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