Commits · master · Normand Erwan / VVVVVV_level_merger

01 Jun, 2015 37 commits
- Added a ref to my Twitter niark niark niark :) · 87968ed2
  Orbmancer authored Jun 02, 2015
  
  87968ed2
- Added the edEntities functionnality · 59e0b68d
  Orbmancer authored Jun 02, 2015
  
  59e0b68d
- Fully functionnal ! · 0529685a
  Orbmancer authored Jun 01, 2015
  
  0529685a
- http://www.commitstrip.com/en/2015/01/26/fixing-a-bug-you-can-only-reproduce-in-production/ · 14700257
  Normand Erwan authored Jun 01, 2015
  
  14700257
- VICTORY ALGO IS FUNCTIONNAL !!!!! beer beer beer :) · c3b43ba3
  Orbmancer authored Jun 01, 2015
  
  c3b43ba3
- isolated some bugs (importXML and or toString) · 30d8be25
  Orbmancer authored Jun 01, 2015
```
whereIsLocated is okay
```
  30d8be25
- latest test case · 53ce6c2f
  Orbmancer authored Jun 01, 2015
  
  53ce6c2f
- Merge branch 'master' of gitlab.utc.fr:enormand/VVVVVV_level_merger · 78e0be8b
  Orbmancer authored Jun 01, 2015
```
Conflicts:
	merge.php
```
  78e0be8b
- echo some stuff · dc52a18c
  Orbmancer authored Jun 01, 2015
  
  dc52a18c
- Doc · a6be940b
  Erwan Normand authored Jun 01, 2015
  
  a6be940b
- Download the merged file · 037959d6
  Erwan Normand authored Jun 01, 2015
  
  037959d6
- Add level layout · 6646caf0
  Erwan Normand authored Jun 01, 2015
  
  6646caf0
- first try merging ! · 64038df1
  Orbmancer authored Jun 01, 2015
```
Still a little buggy
```
  64038df1
- Merge branch 'master' of gitlab.utc.fr:enormand/VVVVVV_level_merger · e9c6a314
  Orbmancer authored Jun 01, 2015
  
  e9c6a314
- first functionnal merge [untested] · a59ec2d0
  Orbmancer authored Jun 01, 2015
  
  a59ec2d0
- Delete levels · 93952191
  Erwan Normand authored Jun 01, 2015
  
  93952191
- Merge form · 6667208f
  Erwan Normand authored Jun 01, 2015
  
  6667208f
- Merge branch 'master' of gitlab.utc.fr:enormand/VVVVVV_level_merger · 98d6b50f
  Orbmancer authored Jun 01, 2015
  
  98d6b50f
- merge algo (getTab, setTab & toString) · f3a2885f
  Orbmancer authored Jun 01, 2015
  
  f3a2885f
- List levels · 0be8f256
  Erwan Normand authored Jun 01, 2015
  
  0be8f256
- started to write merge algo · af841a5f
  Orbmancer authored Jun 01, 2015
  
  af841a5f
- fixed merge bug · 1e6638a5
  Orbmancer authored Jun 01, 2015
  
  1e6638a5
- Merge branch 'master' of gitlab.utc.fr:enormand/VVVVVV_level_merger · d0ec2a09
  Orbmancer authored Jun 01, 2015
```
Conflicts:
	model/Tabs.class.php
```
  d0ec2a09
- debugged level extraction · fd688bf4
  Orbmancer authored Jun 01, 2015
  
  fd688bf4
- Clean the upload · 58f7f5c0
  Erwan Normand authored Jun 01, 2015
  
  58f7f5c0
- Rename · 31df833e
  Erwan Normand authored Jun 01, 2015
  
  31df833e
- began to integrate Contents · 95993ffa
  Orbmancer authored Jun 01, 2015
  
  95993ffa
- loaded contents · a6e12c1a
  Orbmancer authored Jun 01, 2015
  
  a6e12c1a
- Contents contents arrays · 8eb2d849
  Erwan Normand authored Jun 01, 2015
  
  8eb2d849
- loadXML returns for every XML: x, y and content · 68561fb5
  Orbmancer authored Jun 01, 2015
  
  68561fb5
- functionnal save & load · 25bc303e
  Orbmancer authored Jun 01, 2015
  
  25bc303e
- Merge branch 'master' of gitlab.utc.fr:enormand/VVVVVV_level_merger · 92ddf7a4
  Orbmancer authored Jun 01, 2015
  
  92ddf7a4
- first communication between index.html and merge.php · 4573e907
  Orbmancer authored Jun 01, 2015
  
  4573e907
- Import xml contents · 7603656e
  Erwan Normand authored Jun 01, 2015
  
  7603656e
- Created the Content class · 8b4f4f33
  Erwan Normand authored Jun 01, 2015
  
  8b4f4f33
- Interface ready · 536c1564
  Orbmancer authored Jun 01, 2015
  
  536c1564
- First commit ! · 949d80f2
  Orbmancer authored Jun 01, 2015
  
  949d80f2