Browse code

corrected nomenclature for some ned0xxx + DrawSystem zoom set to 1 + new anim for exit portal + set some buttons in the right position

jymis authored on 04/05/2015 21:33:12
Showing 73 changed files
... ...
@@ -1299,7 +1299,7 @@
1299 1299
       "frames": [
1300 1300
         {
1301 1301
           "duration": 100,
1302
-          "image": "ned00100.png",
1302
+          "image": "ned0100.png",
1303 1303
           "u1": 0.0,
1304 1304
           "v1": 0.0,
1305 1305
           "u2": 1.0,
... ...
@@ -1307,7 +1307,7 @@
1307 1307
         },
1308 1308
         {
1309 1309
           "duration": 100,
1310
-          "image": "ned00101.png",
1310
+          "image": "ned0101.png",
1311 1311
           "u1": 0.0,
1312 1312
           "v1": 0.0,
1313 1313
           "u2": 1.0,
... ...
@@ -1315,7 +1315,7 @@
1315 1315
         },
1316 1316
         {
1317 1317
           "duration": 100,
1318
-          "image": "ned00102.png",
1318
+          "image": "ned0102.png",
1319 1319
           "u1": 0.0,
1320 1320
           "v1": 0.0,
1321 1321
           "u2": 1.0,
... ...
@@ -1323,7 +1323,7 @@
1323 1323
         },
1324 1324
         {
1325 1325
           "duration": 100,
1326
-          "image": "ned00103.png",
1326
+          "image": "ned0103.png",
1327 1327
           "u1": 0.0,
1328 1328
           "v1": 0.0,
1329 1329
           "u2": 1.0,
... ...
@@ -1336,7 +1336,7 @@
1336 1336
       "frames": [
1337 1337
         {
1338 1338
           "duration": 100,
1339
-          "image": "ned00104.png",
1339
+          "image": "ned0104.png",
1340 1340
           "u1": 0.0,
1341 1341
           "v1": 0.0,
1342 1342
           "u2": 1.0,
... ...
@@ -1344,7 +1344,7 @@
1344 1344
         },
1345 1345
         {
1346 1346
           "duration": 100,
1347
-          "image": "ned00105.png",
1347
+          "image": "ned0105.png",
1348 1348
           "u1": 0.0,
1349 1349
           "v1": 0.0,
1350 1350
           "u2": 1.0,
... ...
@@ -1352,7 +1352,7 @@
1352 1352
         },
1353 1353
         {
1354 1354
           "duration": 100,
1355
-          "image": "ned00106.png",
1355
+          "image": "ned0106.png",
1356 1356
           "u1": 0.0,
1357 1357
           "v1": 0.0,
1358 1358
           "u2": 1.0,
... ...
@@ -1360,7 +1360,7 @@
1360 1360
         },
1361 1361
         {
1362 1362
           "duration": 100,
1363
-          "image": "ned00107.png",
1363
+          "image": "ned0107.png",
1364 1364
           "u1": 0.0,
1365 1365
           "v1": 0.0,
1366 1366
           "u2": 1.0,
... ...
@@ -1373,7 +1373,7 @@
1373 1373
       "frames": [
1374 1374
         {
1375 1375
           "duration": 100,
1376
-          "image": "ned00108.png",
1376
+          "image": "ned0108.png",
1377 1377
           "u1": 0.0,
1378 1378
           "v1": 0.0,
1379 1379
           "u2": 1.0,
... ...
@@ -1381,7 +1381,7 @@
1381 1381
         },
1382 1382
         {
1383 1383
           "duration": 100,
1384
-          "image": "ned00109.png",
1384
+          "image": "ned0109.png",
1385 1385
           "u1": 0.0,
1386 1386
           "v1": 0.0,
1387 1387
           "u2": 1.0,
... ...
@@ -1389,7 +1389,7 @@
1389 1389
         },
1390 1390
         {
1391 1391
           "duration": 100,
1392
-          "image": "ned00110.png",
1392
+          "image": "ned0110.png",
1393 1393
           "u1": 0.0,
1394 1394
           "v1": 0.0,
1395 1395
           "u2": 1.0,
... ...
@@ -1397,7 +1397,7 @@
1397 1397
         },
1398 1398
         {
1399 1399
           "duration": 100,
1400
-          "image": "ned00111.png",
1400
+          "image": "ned0111.png",
1401 1401
           "u1": 0.0,
1402 1402
           "v1": 0.0,
1403 1403
           "u2": 1.0,
... ...
@@ -1410,7 +1410,7 @@
1410 1410
       "frames": [
1411 1411
         {
1412 1412
           "duration": 100,
1413
-          "image": "ned00112.png",
1413
+          "image": "ned0112.png",
1414 1414
           "u1": 0.0,
1415 1415
           "v1": 0.0,
1416 1416
           "u2": 1.0,
... ...
@@ -1418,7 +1418,7 @@
1418 1418
         },
1419 1419
         {
1420 1420
           "duration": 100,
1421
-          "image": "ned00113.png",
1421
+          "image": "ned0113.png",
1422 1422
           "u1": 0.0,
1423 1423
           "v1": 0.0,
1424 1424
           "u2": 1.0,
... ...
@@ -1426,7 +1426,7 @@
1426 1426
         },
1427 1427
         {
1428 1428
           "duration": 100,
1429
-          "image": "ned00114.png",
1429
+          "image": "ned0114.png",
1430 1430
           "u1": 0.0,
1431 1431
           "v1": 0.0,
1432 1432
           "u2": 1.0,
... ...
@@ -1434,7 +1434,7 @@
1434 1434
         },
1435 1435
         {
1436 1436
           "duration": 100,
1437
-          "image": "ned00115.png",
1437
+          "image": "ned0115.png",
1438 1438
           "u1": 0.0,
1439 1439
           "v1": 0.0,
1440 1440
           "u2": 1.0,
... ...
@@ -1447,7 +1447,7 @@
1447 1447
       "frames": [
1448 1448
         {
1449 1449
           "duration": 100,
1450
-          "image": "ned00116.png",
1450
+          "image": "ned0116.png",
1451 1451
           "u1": 0.0,
1452 1452
           "v1": 0.0,
1453 1453
           "u2": 1.0,
... ...
@@ -1455,7 +1455,7 @@
1455 1455
         },
1456 1456
         {
1457 1457
           "duration": 100,
1458
-          "image": "ned00117.png",
1458
+          "image": "ned0117.png",
1459 1459
           "u1": 0.0,
1460 1460
           "v1": 0.0,
1461 1461
           "u2": 1.0,
... ...
@@ -1463,7 +1463,7 @@
1463 1463
         },
1464 1464
         {
1465 1465
           "duration": 100,
1466
-          "image": "ned00118.png",
1466
+          "image": "ned0118.png",
1467 1467
           "u1": 0.0,
1468 1468
           "v1": 0.0,
1469 1469
           "u2": 1.0,
... ...
@@ -1471,7 +1471,7 @@
1471 1471
         },
1472 1472
         {
1473 1473
           "duration": 100,
1474
-          "image": "ned00119.png",
1474
+          "image": "ned0119.png",
1475 1475
           "u1": 0.0,
1476 1476
           "v1": 0.0,
1477 1477
           "u2": 1.0,
... ...
@@ -1484,7 +1484,7 @@
1484 1484
       "frames": [
1485 1485
         {
1486 1486
           "duration": 100,
1487
-          "image": "ned00120.png",
1487
+          "image": "ned0120.png",
1488 1488
           "u1": 0.0,
1489 1489
           "v1": 0.0,
1490 1490
           "u2": 1.0,
... ...
@@ -1492,7 +1492,7 @@
1492 1492
         },
1493 1493
         {
1494 1494
           "duration": 100,
1495
-          "image": "ned00121.png",
1495
+          "image": "ned0121.png",
1496 1496
           "u1": 0.0,
1497 1497
           "v1": 0.0,
1498 1498
           "u2": 1.0,
... ...
@@ -1500,7 +1500,7 @@
1500 1500
         },
1501 1501
         {
1502 1502
           "duration": 100,
1503
-          "image": "ned00122.png",
1503
+          "image": "ned0122.png",
1504 1504
           "u1": 0.0,
1505 1505
           "v1": 0.0,
1506 1506
           "u2": 1.0,
... ...
@@ -1508,7 +1508,7 @@
1508 1508
         },
1509 1509
         {
1510 1510
           "duration": 100,
1511
-          "image": "ned00123.png",
1511
+          "image": "ned0123.png",
1512 1512
           "u1": 0.0,
1513 1513
           "v1": 0.0,
1514 1514
           "u2": 1.0,
1515 1515
deleted file mode 100644
1516 1516
Binary files a/assets/animation/ned/ned00100.png and /dev/null differ
1517 1517
deleted file mode 100644
1518 1518
Binary files a/assets/animation/ned/ned00101.png and /dev/null differ
1519 1519
deleted file mode 100644
1520 1520
Binary files a/assets/animation/ned/ned00102.png and /dev/null differ
1521 1521
deleted file mode 100644
1522 1522
Binary files a/assets/animation/ned/ned00103.png and /dev/null differ
1523 1523
deleted file mode 100644
1524 1524
Binary files a/assets/animation/ned/ned00104.png and /dev/null differ
1525 1525
deleted file mode 100644
1526 1526
Binary files a/assets/animation/ned/ned00105.png and /dev/null differ
1527 1527
deleted file mode 100644
1528 1528
Binary files a/assets/animation/ned/ned00106.png and /dev/null differ
1529 1529
deleted file mode 100644
1530 1530
Binary files a/assets/animation/ned/ned00107.png and /dev/null differ
1531 1531
deleted file mode 100644
1532 1532
Binary files a/assets/animation/ned/ned00108.png and /dev/null differ
1533 1533
deleted file mode 100644
1534 1534
Binary files a/assets/animation/ned/ned00109.png and /dev/null differ
1535 1535
deleted file mode 100644
1536 1536
Binary files a/assets/animation/ned/ned00110.png and /dev/null differ
1537 1537
deleted file mode 100644
1538 1538
Binary files a/assets/animation/ned/ned00111.png and /dev/null differ
1539 1539
deleted file mode 100644
1540 1540
Binary files a/assets/animation/ned/ned00112.png and /dev/null differ
1541 1541
deleted file mode 100644
1542 1542
Binary files a/assets/animation/ned/ned00113.png and /dev/null differ
1543 1543
deleted file mode 100644
1544 1544
Binary files a/assets/animation/ned/ned00114.png and /dev/null differ
1545 1545
deleted file mode 100644
1546 1546
Binary files a/assets/animation/ned/ned00115.png and /dev/null differ
1547 1547
deleted file mode 100644
1548 1548
Binary files a/assets/animation/ned/ned00116.png and /dev/null differ
1549 1549
deleted file mode 100644
1550 1550
Binary files a/assets/animation/ned/ned00117.png and /dev/null differ
1551 1551
deleted file mode 100644
1552 1552
Binary files a/assets/animation/ned/ned00118.png and /dev/null differ
1553 1553
deleted file mode 100644
1554 1554
Binary files a/assets/animation/ned/ned00119.png and /dev/null differ
1555 1555
deleted file mode 100644
1556 1556
Binary files a/assets/animation/ned/ned00120.png and /dev/null differ
1557 1557
deleted file mode 100644
1558 1558
Binary files a/assets/animation/ned/ned00121.png and /dev/null differ
1559 1559
deleted file mode 100644
1560 1560
Binary files a/assets/animation/ned/ned00122.png and /dev/null differ
1561 1561
deleted file mode 100644
1562 1562
Binary files a/assets/animation/ned/ned00123.png and /dev/null differ
1563 1563
new file mode 100644
1564 1564
Binary files /dev/null and b/assets/animation/ned/ned0100.png differ
1565 1565
new file mode 100644
1566 1566
Binary files /dev/null and b/assets/animation/ned/ned0101.png differ
1567 1567
new file mode 100644
1568 1568
Binary files /dev/null and b/assets/animation/ned/ned0102.png differ
1569 1569
new file mode 100644
1570 1570
Binary files /dev/null and b/assets/animation/ned/ned0103.png differ
1571 1571
new file mode 100644
1572 1572
Binary files /dev/null and b/assets/animation/ned/ned0104.png differ
1573 1573
new file mode 100644
1574 1574
Binary files /dev/null and b/assets/animation/ned/ned0105.png differ
1575 1575
new file mode 100644
1576 1576
Binary files /dev/null and b/assets/animation/ned/ned0106.png differ
1577 1577
new file mode 100644
1578 1578
Binary files /dev/null and b/assets/animation/ned/ned0107.png differ
1579 1579
new file mode 100644
1580 1580
Binary files /dev/null and b/assets/animation/ned/ned0108.png differ
1581 1581
new file mode 100644
1582 1582
Binary files /dev/null and b/assets/animation/ned/ned0109.png differ
1583 1583
new file mode 100644
1584 1584
Binary files /dev/null and b/assets/animation/ned/ned0110.png differ
1585 1585
new file mode 100644
1586 1586
Binary files /dev/null and b/assets/animation/ned/ned0111.png differ
1587 1587
new file mode 100644
1588 1588
Binary files /dev/null and b/assets/animation/ned/ned0112.png differ
1589 1589
new file mode 100644
1590 1590
Binary files /dev/null and b/assets/animation/ned/ned0113.png differ
1591 1591
new file mode 100644
1592 1592
Binary files /dev/null and b/assets/animation/ned/ned0114.png differ
1593 1593
new file mode 100644
1594 1594
Binary files /dev/null and b/assets/animation/ned/ned0115.png differ
1595 1595
new file mode 100644
1596 1596
Binary files /dev/null and b/assets/animation/ned/ned0116.png differ
1597 1597
new file mode 100644
1598 1598
Binary files /dev/null and b/assets/animation/ned/ned0117.png differ
1599 1599
new file mode 100644
1600 1600
Binary files /dev/null and b/assets/animation/ned/ned0118.png differ
1601 1601
new file mode 100644
1602 1602
Binary files /dev/null and b/assets/animation/ned/ned0119.png differ
1603 1603
new file mode 100644
1604 1604
Binary files /dev/null and b/assets/animation/ned/ned0120.png differ
1605 1605
new file mode 100644
1606 1606
Binary files /dev/null and b/assets/animation/ned/ned0121.png differ
1607 1607
new file mode 100644
1608 1608
Binary files /dev/null and b/assets/animation/ned/ned0122.png differ
1609 1609
new file mode 100644
1610 1610
Binary files /dev/null and b/assets/animation/ned/ned0123.png differ
... ...
@@ -4,8 +4,24 @@
4 4
       "name": "survol",
5 5
       "frames": [
6 6
         {
7
+          "duration": 150,
8
+          "image": "portail00.png",
9
+          "u1": 0.0,
10
+          "v1": 0.0,
11
+          "u2": 1.0,
12
+          "v2": 1.0
13
+        },
14
+        {
15
+          "duration": 100,
16
+          "image": "portail01.png",
17
+          "u1": 0.0,
18
+          "v1": 0.0,
19
+          "u2": 1.0,
20
+          "v2": 1.0
21
+        },
22
+        {
7 23
           "duration": 100,
8
-          "image": "portail0.png",
24
+          "image": "portail02.png",
9 25
           "u1": 0.0,
10 26
           "v1": 0.0,
11 27
           "u2": 1.0,
... ...
@@ -13,7 +29,47 @@
13 29
         },
14 30
         {
15 31
           "duration": 100,
16
-          "image": "portail1.png",
32
+          "image": "portail03.png",
33
+          "u1": 0.0,
34
+          "v1": 0.0,
35
+          "u2": 1.0,
36
+          "v2": 1.0
37
+        },
38
+        {
39
+          "duration": 300,
40
+          "image": "portail04.png",
41
+          "u1": 0.0,
42
+          "v1": 0.0,
43
+          "u2": 1.0,
44
+          "v2": 1.0
45
+        },
46
+        {
47
+          "duration": 100,
48
+          "image": "portail03.png",
49
+          "u1": 0.0,
50
+          "v1": 0.0,
51
+          "u2": 1.0,
52
+          "v2": 1.0
53
+        },
54
+        {
55
+          "duration": 100,
56
+          "image": "portail02.png",
57
+          "u1": 0.0,
58
+          "v1": 0.0,
59
+          "u2": 1.0,
60
+          "v2": 1.0
61
+        },
62
+        {
63
+          "duration": 100,
64
+          "image": "portail01.png",
65
+          "u1": 0.0,
66
+          "v1": 0.0,
67
+          "u2": 1.0,
68
+          "v2": 1.0
69
+        },
70
+        {
71
+          "duration": 150,
72
+          "image": "portail00.png",
17 73
           "u1": 0.0,
18 74
           "v1": 0.0,
19 75
           "u2": 1.0,
... ...
@@ -26,7 +82,7 @@
26 82
       "frames": [
27 83
         {
28 84
           "duration": 100,
29
-          "image": "portail1.png",
85
+          "image": "portail04.png",
30 86
           "u1": 0.0,
31 87
           "v1": 0.0,
32 88
           "u2": 1.0,
... ...
@@ -34,7 +90,7 @@
34 90
         },
35 91
         {
36 92
           "duration": 100,
37
-          "image": "portail3.png",
93
+          "image": "portail05.png",
38 94
           "u1": 0.0,
39 95
           "v1": 0.0,
40 96
           "u2": 1.0,
... ...
@@ -46,8 +102,8 @@
46 102
       "name": "normal",
47 103
       "frames": [
48 104
         {
49
-          "duration": 100000,
50
-          "image": "portail0.png",
105
+          "duration": 100,
106
+          "image": "portail00.png",
51 107
           "u1": 0.0,
52 108
           "v1": 0.0,
53 109
           "u2": 1.0,
54 110
deleted file mode 100644
55 111
Binary files a/assets/animation/portail/portail0.png and /dev/null differ
56 112
new file mode 100644
57 113
Binary files /dev/null and b/assets/animation/portail/portail00.png differ
58 114
new file mode 100644
59 115
Binary files /dev/null and b/assets/animation/portail/portail01.png differ
60 116
new file mode 100644
61 117
Binary files /dev/null and b/assets/animation/portail/portail02.png differ
62 118
new file mode 100644
63 119
Binary files /dev/null and b/assets/animation/portail/portail03.png differ
64 120
new file mode 100644
65 121
Binary files /dev/null and b/assets/animation/portail/portail04.png differ
66 122
new file mode 100644
67 123
Binary files /dev/null and b/assets/animation/portail/portail05.png differ
68 124
new file mode 100644
69 125
Binary files /dev/null and b/assets/animation/portail/portail06.png differ
70 126
new file mode 100644
71 127
Binary files /dev/null and b/assets/animation/portail/portail07.png differ
72 128
new file mode 100644
73 129
Binary files /dev/null and b/assets/animation/portail/portail08.png differ
74 130
new file mode 100644
75 131
Binary files /dev/null and b/assets/animation/portail/portail09.png differ
76 132
deleted file mode 100644
77 133
Binary files a/assets/animation/portail/portail1.png and /dev/null differ
78 134
new file mode 100644
79 135
Binary files /dev/null and b/assets/animation/portail/portail10.png differ
80 136
new file mode 100644
81 137
Binary files /dev/null and b/assets/animation/portail/portail11.png differ
82 138
deleted file mode 100644
83 139
Binary files a/assets/animation/portail/portail2.png and /dev/null differ
84 140
deleted file mode 100644
85 141
Binary files a/assets/animation/portail/portail3.png and /dev/null differ
86 142
deleted file mode 100644
87 143
Binary files a/assets/animation/portail/portail4.png and /dev/null differ
88 144
deleted file mode 100644
89 145
Binary files a/assets/animation/portail/portail5.png and /dev/null differ
90 146
deleted file mode 100644
91 147
Binary files a/assets/animation/portail/portail6.png and /dev/null differ
92 148
deleted file mode 100644
93 149
Binary files a/assets/animation/portail/portail7.png and /dev/null differ
94 150
deleted file mode 100644
95 151
Binary files a/assets/animation/portail/portail8.png and /dev/null differ
... ...
@@ -60,7 +60,7 @@ public class LevelSelector extends Container {
60 60
         this.showMenuTrigger = showMenuTrigger;
61 61
         bulleAnimations = assets.getAnimations("animation/bulle/bulle.json");
62 62
         setBackground(new TexturedBackground(assets.getAnimations("tour.png").getFirst().start(PlayMode.LOOP)));
63
-        setFocusedChild(addButton("level.01.name", "levels/t1/lvl01.tmx", 1087, 938, 1));
63
+        setFocusedChild(addButton("level.01.name", "levels/t1/lvl01.tmx", 1045, 855, 1));
64 64
         addButton("level.02.name", "levels/t1/lvl02.tmx", 825, 910, -1);
65 65
         addButton("level.03.name", "levels/t1/lvl03.tmx", 1087, 881, 1);
66 66
         addButton("level.04.name", "levels/t1/lvl04.tmx", 825, 853, -1);
... ...
@@ -102,10 +102,10 @@ public class LevelSelector extends Container {
102 102
         backButton.setFocusCursor(NullFocusCursor.INSTANCE);
103 103
         backButton.setBackground(new TexturedBackground(assets.getAnimations("animation/portail/portail.json").getAnimationByName("normal").start(PlayMode.LOOP)));
104 104
         backButton.setFocusedBackground(new TexturedBackground(assets.getAnimations("animation/portail/portail.json").getAnimationByName("survol").start(PlayMode.LOOP)));
105
-        backButton.setX(555);
106
-        backButton.setY(406);
107
-        backButton.setWidth(195);
108
-        backButton.setHeight(267);
105
+        backButton.setX(526);
106
+        backButton.setY(383);
107
+        backButton.setWidth(131);
108
+        backButton.setHeight(199);
109 109
         this.add(backButton);
110 110
     }
111 111
 
... ...
@@ -131,7 +131,7 @@ public class LevelSelector extends Container {
131 131
         button.setBackground(background);
132 132
         final TexturedBackground focusedBackground = new TexturedBackground(bulleAnimations.getAnimationByName("bulle_selectionnee").start(PlayMode.LOOP));
133 133
         button.setFocusedBackground(focusedBackground);
134
-        button.setWidth(button.getMinWidth() * 1.8f);
134
+        button.setWidth(button.getMinWidth());
135 135
         button.setHeight(button.getMinHeight());
136 136
         if (orientation < 0) {
137 137
             button.setX(x - button.getWidth());
... ...
@@ -91,7 +91,7 @@ public class DrawSystem extends EntitySystem implements IDrawSystem {
91 91
     };
92 92
     private SpriteProjector spriteProjector;
93 93
     private final Viewport viewPort = new Viewport();
94
-    private static final float spriteGlobalScale = 1.2f;
94
+    private static final float spriteGlobalScale = 1.0f;
95 95
     private final Bag<Entity> backgrounds = new Bag<Entity>();
96 96
     private final Bag<Entity> sprites = new Bag<Entity>();
97 97
     private final Bag<Entity> uis = new Bag<Entity>();