diff options
author | chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> | 2014-03-04 13:12:58 +0000 |
---|---|---|
committer | chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> | 2014-03-04 13:12:58 +0000 |
commit | 06373ac4a3dd68d2bd06224686b1e44aff50f54c (patch) | |
tree | db26658c87f8f4d6690d0b6a103ff2d5976f0ae6 | |
parent | 3783f7242d204c3ef1c2afe38839ff3bfe11ec50 (diff) | |
download | bullet-lab-remix-06373ac4a3dd68d2bd06224686b1e44aff50f54c.tar.xz |
Dummy commit. Ensure all files are latest. I'm going to make a testing Windows build.
-rwxr-xr-x | CHANGELOG.TXT | 6 | ||||
-rw-r--r-- | levels.h | 4 | ||||
-rw-r--r-- | towernbullet.h | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 5d8810e..9730ac6 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -9,6 +9,12 @@ There's only one level left before the next pre-release version!! Pre-Released versions: 0.7.2-1_PR (b71) +(Level7 will be almost twice longer than Level6!) +I'm extremely tired these days, I can't even keep my eyes open +while typing... +Some of my classmates helped testing several levels and found +some bugs, thanks a lot! +===Real changelog starts from here=== New level "Trypophobia", however it seems that this level won't cause trypophobia at all! New level "Photon fusion", using a slightly modified Tower8. @@ -1149,7 +1149,7 @@ void Level5Part4() else laser[i].Setdata(j,t,s,0xEEFF8800); trad=initrad+j*pi/36.0f; - if (shot&&j==pos)CreateBullet2(400+t.x,300+t.y,0.0f,rand()%100,1); + if (shot&&j==pos)bullet[CreateBullet2(400+t.x,300+t.y,0.0f,rand()%100,1)].alterColor=orange; } if (pos>8&&pos<23) laser[i].EnableColl=true; @@ -3033,7 +3033,7 @@ void Level7Part28() void Level7Part29()//Minesweeper { frameleft=AMinute; - if (bulcnt!=0)return (void)ClearAll(); + All2pnt();towcnt=0; Lasercnt=0; ++part; } diff --git a/towernbullet.h b/towernbullet.h index a13f7e6..a5d643a 100644 --- a/towernbullet.h +++ b/towernbullet.h @@ -1450,7 +1450,7 @@ public: Render(); if (EnableColl) { - if (GetDist()<8.0f&&clrrange<1e-5&&clrrad-pi/2<1e-7) + if (GetDist()<4.0f&&clrrange<1e-5&&clrrad-pi/2<1e-7) { if (!LOWFPS)++collbrk;else collbrk+=17; if (collbrk>200) |