| Chunk |
|---|
| Conflicting content |
|---|
entities_matrix.add(judgment_entity);
note_counter.get(judge).incNumber();
<<<<<<< HEAD
ranking_entity.addNumber(computeRanking(judge));
if(judge.equals("JUDGMENT_COOL"))
jamcombo_counter += 2;
else if(judge.equals("JUDGMENT_GOOD"))
jamcombo_counter++;
else
{
jamcombo_counter = 0;
jamcombo_entity.resetNumber();
}
if(ne.getHit() > 0) // TODO: compare with MISS ?
=======
if(!judge.equals(MISS_JUDGE))
>>>>>>> 52269c003731493e89b82c3a6bb40bf40541377b
{
Entity ee = skin.getEntityMap().get("EFFECT_CLICK_1").copy();
ee.setPos(ne.getX()+ne.getWidth()/2-ee.getWidth()/2, |
| Solution content |
|---|
else
{
entities_matrix.add(judgment_entity);
note_counter.get(judge).incNumber();
ranking_entity.addNumber(computeRanking(judge));
if(judge.equals("JUDGMENT_COOL"))
jamcombo_counter += 2;
else if(judge.equals("JUDGMENT_GOOD"))
jamcombo_counter++;
jamcombo_counter = 0;
jamcombo_entity.resetNumber();
}
if(!judge.equals(MISS_JUDGE))
{
Entity ee = skin.getEntityMap().get("EFFECT_CLICK_1").copy();
ee.setPos(ne.getX()+ne.getWidth()/2-ee.getWidth()/2, |
| File |
|---|
| Render.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |