added pellet entity as well as minor changes to collision functions

Browse Source

...

This commit is contained in:

Harrison Deng

2017-06-01 23:41:04 -05:00

parent e6be886888

commit 615789fe81

73 changed files with 40 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

android/assets/1280x720/PolyjetTitle.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 8.7 KiB

BIN

android/assets/1280x720/Tech-Circle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 31 KiB After Width:  |  Height:  |  Size: 41 KiB

BIN

android/assets/1280x720/cybercircle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 20 KiB

BIN

android/assets/1280x720/cybercircle3B.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 18 KiB After Width:  |  Height:  |  Size: 23 KiB

BIN

android/assets/1280x720/laser.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 141 B After Width:  |  Height:  |  Size: 155 B

BIN

android/assets/1280x720/pellet.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 126 B After Width:  |  Height:  |  Size: 177 B

BIN

android/assets/1280x720/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 619 B After Width:  |  Height:  |  Size: 336 B

BIN

android/assets/1280x720/splashlogo.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.7 KiB After Width:  |  Height:  |  Size: 11 KiB

0

android/assets/1280x720/square.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 96 B After Width:  |  Height:  |  Size: 96 B

BIN

android/assets/1280x800/PolyjetTitle.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.6 KiB After Width:  |  Height:  |  Size: 10 KiB

BIN

android/assets/1280x800/Tech-Circle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 37 KiB After Width:  |  Height:  |  Size: 51 KiB

BIN

android/assets/1280x800/cybercircle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 28 KiB

BIN

android/assets/1280x800/cybercircle3B.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 32 KiB

BIN

android/assets/1280x800/laser.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 146 B After Width:  |  Height:  |  Size: 173 B

BIN

android/assets/1280x800/pellet.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 147 B After Width:  |  Height:  |  Size: 204 B

BIN

android/assets/1280x800/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 747 B After Width:  |  Height:  |  Size: 361 B

BIN

android/assets/1280x800/splashlogo.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.2 KiB After Width:  |  Height:  |  Size: 18 KiB

0

android/assets/1280x800/square.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 100 B After Width:  |  Height:  |  Size: 100 B

BIN

android/assets/1366x768/PolyjetTitle.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 9.5 KiB

BIN

android/assets/1366x768/Tech-Circle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 35 KiB After Width:  |  Height:  |  Size: 48 KiB

BIN

android/assets/1366x768/cybercircle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 26 KiB

BIN

android/assets/1366x768/cybercircle3B.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 31 KiB

BIN

android/assets/1366x768/laser.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 156 B After Width:  |  Height:  |  Size: 171 B

BIN

android/assets/1366x768/pellet.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 92 B After Width:  |  Height:  |  Size: 185 B

BIN

android/assets/1366x768/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 681 B After Width:  |  Height:  |  Size: 347 B

BIN

android/assets/1366x768/splashlogo.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.4 KiB After Width:  |  Height:  |  Size: 17 KiB

0

android/assets/1366x768/square.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 98 B After Width:  |  Height:  |  Size: 98 B

BIN

android/assets/1920x1080/PolyjetTitle.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.7 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

android/assets/1920x1080/Tech-Circle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 63 KiB After Width:  |  Height:  |  Size: 74 KiB

BIN

android/assets/1920x1080/cybercircle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 30 KiB After Width:  |  Height:  |  Size: 38 KiB

BIN

android/assets/1920x1080/cybercircle3B.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 33 KiB After Width:  |  Height:  |  Size: 43 KiB

BIN

android/assets/1920x1080/laser.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 215 B After Width:  |  Height:  |  Size: 242 B

BIN

android/assets/1920x1080/pellet.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 132 B After Width:  |  Height:  |  Size: 239 B

BIN

android/assets/1920x1080/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 990 B After Width:  |  Height:  |  Size: 450 B

BIN

android/assets/1920x1080/splashlogo.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 16 KiB

0

android/assets/1920x1080/square.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 114 B After Width:  |  Height:  |  Size: 114 B

BIN

android/assets/1920x1200/PolyjetTitle.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.6 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

android/assets/1920x1200/Tech-Circle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 76 KiB After Width:  |  Height:  |  Size: 93 KiB

BIN

android/assets/1920x1200/cybercircle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 25 KiB After Width:  |  Height:  |  Size: 52 KiB

BIN

android/assets/1920x1200/cybercircle3B.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 27 KiB After Width:  |  Height:  |  Size: 58 KiB

BIN

android/assets/1920x1200/laser.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 237 B After Width:  |  Height:  |  Size: 297 B

BIN

android/assets/1920x1200/pellet.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 174 B After Width:  |  Height:  |  Size: 282 B

BIN

android/assets/1920x1200/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 592 B

BIN

android/assets/1920x1200/splashlogo.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 30 KiB

0

android/assets/1920x1200/square.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 122 B After Width:  |  Height:  |  Size: 122 B

BIN

android/assets/2560x1440/PolyjetTitle.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.0 KiB After Width:  |  Height:  |  Size: 21 KiB

BIN

android/assets/2560x1440/Tech-Circle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 106 KiB After Width:  |  Height:  |  Size: 123 KiB

BIN

android/assets/2560x1440/cybercircle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 44 KiB After Width:  |  Height:  |  Size: 61 KiB

BIN

android/assets/2560x1440/cybercircle3B.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 49 KiB After Width:  |  Height:  |  Size: 68 KiB

BIN

android/assets/2560x1440/laser.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 285 B After Width:  |  Height:  |  Size: 338 B

BIN

android/assets/2560x1440/pellet.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 229 B After Width:  |  Height:  |  Size: 337 B

BIN

android/assets/2560x1440/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 733 B

BIN

android/assets/2560x1440/splashlogo.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 31 KiB

0

android/assets/2560x1440/square.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 139 B After Width:  |  Height:  |  Size: 139 B

BIN

android/assets/3840x2160/pellet.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 533 B After Width:  |  Height:  |  Size: 577 B

BIN

android/assets/3840x2160/polyjet-standard.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 1.1 KiB

BIN

android/assets/800x480/PolyjetTitle.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 5.4 KiB

BIN

android/assets/800x480/Tech-Circle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 24 KiB

BIN

android/assets/800x480/cybercircle1.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.8 KiB After Width:  |  Height:  |  Size: 11 KiB

BIN

android/assets/800x480/cybercircle3B.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.5 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

android/assets/800x480/laser.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 99 B After Width:  |  Height:  |  Size: 136 B

BIN

android/assets/800x480/pellet.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 95 B After Width:  |  Height:  |  Size: 129 B

BIN

android/assets/800x480/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 373 B After Width:  |  Height:  |  Size: 220 B

BIN

android/assets/800x480/splashlogo.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.6 KiB After Width:  |  Height:  |  Size: 9.0 KiB

0

android/assets/800x480/square.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 84 B After Width:  |  Height:  |  Size: 84 B