Revision 8b6928b by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 7, 2015, 09:54 (GMT) |
Merge branch 'master' into id-remap |
Revision f0c6c85 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 6, 2015, 17:00 (GMT) |
Attempt to fix the 'user_one' mess... Seems to work (though will need much more tests), but makes code more ugly. :| |
Revision 0c8b1a8 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 6, 2015, 11:35 (GMT) |
Merge branch 'master' into id-remap |
Revision 9521d71 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 2, 2015, 18:22 (GMT) |
Merge branch 'master' into id-remap |
Revision 6bf915e by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) October 27, 2015, 14:04 (GMT) |
Merge branch 'master' into id-remap |
Revision 2d7bc36 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) October 17, 2015, 09:39 (GMT) |
Merge branch 'missing-libs' into id-remap |
Revision 177295f by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap, missing-libs) October 17, 2015, 09:34 (GMT) |
Merge branch 'master' into missing-libs |
Revision de71f7a by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) October 15, 2015, 15:03 (GMT) |
Fix deadlock. Would be really cool if Main spinlock could be re-entrant. :| |
Revision 6da735e by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) October 15, 2015, 14:55 (GMT) |
Merge branch 'missing-libs' into id-remap |
Revision 59ff3b5 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap, missing-libs) October 15, 2015, 14:12 (GMT) |
Merge branch 'master' into missing-libs |
Revision 9a97965 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) October 15, 2015, 13:33 (GMT) |
Fix broken ID placeholder code (from recent merges). Here we need a bit different handling than in missing-lib branch... |
Revision d899710 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) October 14, 2015, 19:24 (GMT) |
Merge branch 'missing-libs' into id-remap Huge load of conflicts, hope it did not break too much things... Current code build, but crashes easily :| |
Revision a6028f8 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) October 14, 2015, 18:38 (GMT) |
Merge branch 'master' into id-remap |
Revision 3ffc5c9 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap, missing-libs) October 14, 2015, 18:24 (GMT) |
Moar cleanup. |
Revision f15741f by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap, missing-libs) October 14, 2015, 15:17 (GMT) |
Merge branch 'master' into missing-libs |
Revision b895308 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap, missing-libs) October 14, 2015, 14:22 (GMT) |
Cleanup. |
Revision 4dac0af by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap, missing-libs) October 13, 2015, 13:48 (GMT) |
Merge branch 'free-refcount-ids' into missing-libs |
Revision 168604e by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, free-refcount-ids, id-remap, missing-libs) October 13, 2015, 13:44 (GMT) |
Revert to master - those changes are globally valid, but remain incomplete, and total new code is being done in id-remap anyway, not worth bothering with this for now... |
Revision 9d5cdf9 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, free-refcount-ids, id-remap, missing-libs) October 13, 2015, 13:41 (GMT) |
Merge branch 'master' into free-refcount-ids |
Revision 67d922f by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, free-refcount-ids, id-remap, missing-libs) October 13, 2015, 12:41 (GMT) |
Merge branch 'master' into free-refcount-ids |
|