BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 07e59bd0e2 Scroll to next stage works! PlatinumSkink 2015-10-07 19:19:55 +02:00
  • ef5882ffbf Vattnet fungerar nu igen. Stiffly 2015-10-07 19:18:49 +02:00
  • 1a1b94477e Merge remote-tracking branch 'origin/master' into water Stiffly 2015-10-07 18:34:36 +02:00
  • db2d6ad6e4 Eventbaserade partiklar. Fick nån krasch i physicssystem efter ett tags spelande, men det hoppas jag löser sig när jag mergar in Viktors senaste fysikfixar :3 Stiffly 2015-10-07 17:22:45 +02:00
  • 9bb50067fc Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch PlatinumSkink 2015-10-07 17:13:05 +02:00
  • 3814c25931 Squid does not move until space is pressed. Experimenting with scroll. This shouldn't really be committed, but Visual Studio. PlatinumSkink 2015-10-07 17:09:55 +02:00
  • bfa8545483 Visual Studio build now outputs all binaries to the same folder regardless of build configuration Jace 2015-10-06 20:50:05 +02:00
  • d3c3e3c035 Merge branch 'master' of github.com:teamfisk/AgileBreakOut Jace 2015-10-07 15:46:17 +02:00
  • 129ef1f779 Corrected FrameTest Jace 2015-10-07 15:46:07 +02:00
  • 71fe786b04 even more bug fixes viktorljung 2015-10-07 15:45:50 +02:00
  • 892fe5e666 Merge branch 'master' of github.com:teamfisk/AgileBreakOut viktorljung 2015-10-07 15:40:14 +02:00
  • 562a5fa269 fixed more bugs viktorljung 2015-10-07 15:40:04 +02:00
  • 80625a2b55 Merge branch 'master' of github.com:teamfisk/AgileBreakOut Jace 2015-10-07 15:34:44 +02:00
  • 4db9995dc1 Removed CMake Boost debug output crap Jace 2015-10-07 15:34:30 +02:00
  • 9ef845955b removed unfinished physicstest viktorljung 2015-10-07 14:45:32 +02:00
  • 1462ca6111 fixes viktorljung 2015-10-07 14:41:59 +02:00
  • 3f44547d25 NO MERCY, BITCHERS Jace 2015-10-07 14:29:28 +02:00
  • 8b12c1036d Partycles. Stiffly 2015-10-06 21:42:54 +02:00
  • b7696b8776 Merge branch 'LevelSystemAndSuch', and adjusted ball size. PlatinumSkink 2015-10-06 20:35:44 +02:00
  • b036357e3b Merge branch 'Physics' viktorljung 2015-10-06 20:16:57 +02:00
  • 1f10d24448 Commented out couts. PlatinumSkink 2015-10-06 19:57:57 +02:00
  • 902098a72d Fixed all bugs I know of. MultiBall appear upon ice falling in water. PlatinumSkink 2015-10-06 19:41:24 +02:00
  • 65c01f9b8e Improved collisions with multiple objects in the same frame viktorljung 2015-10-06 19:41:00 +02:00
  • a3b21581e2 Merge remote-tracking branch 'origin/Physics' into LevelSystemAndSuch PlatinumSkink 2015-10-06 18:33:49 +02:00
  • 6205e84ff1 Fixed minor things PlatinumSkink 2015-10-06 18:33:18 +02:00
  • a2dc76051f Bodies are now removed properly viktorljung 2015-10-06 18:32:22 +02:00
  • fb8d6f210a Merge remote-tracking branch 'origin/LevelSystemAndSuch' into Physics viktorljung 2015-10-06 16:13:17 +02:00
  • 7899750284 Potential fix to crazy memory bug? Jace 2015-10-06 15:54:48 +02:00
  • 47b5073657 Added debug version of liquidfun library for MSVC12 Jace 2015-10-06 15:54:35 +02:00
  • 4617dd95b7 Correction: Not Stable! PlatinumSkink 2015-10-06 15:38:15 +02:00
  • 5b425f27ae Fixed invisible item bug, maybe. Put 0.1 sec hitlag on impact with pad. Stable level loading? PlatinumSkink 2015-10-06 15:31:48 +02:00
  • 791c3ce69c Some fixes to the brick models viktorljung 2015-10-06 15:30:11 +02:00
  • 7173fdf396 MSVC12 compiler compability fixes Jace 2015-10-06 15:27:11 +02:00
  • 6feb587380 MSVC12 dependencies Jace 2015-10-06 15:26:44 +02:00
  • ca810743b2 Angle and spread on particle system. Need to make them not collide. Stiffly 2015-10-06 13:38:40 +02:00
  • 43e0a5b699 Rectangle shape now has the size of the rigidbody, not scale viktorljung 2015-10-06 13:31:23 +02:00
  • a8219e2129 Doesn't work right now. Cloning bricks kills makes balls stop bouncing on them. PlatinumSkink 2015-10-05 17:55:02 +02:00
  • 1d42e107de Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-10-05 17:02:42 +02:00
  • 56086d6061 Implemented GetNextLevel function with hard-coded levels. PlatinumSkink 2015-10-05 16:35:37 +02:00
  • 005fd40167 Added IceBrick and started to remove the scale dependency for physics bodies viktorljung 2015-10-05 16:25:00 +02:00
  • 371d21cb35 Buttons are now not clickable when they're hidden Jace 2015-10-05 14:27:27 +02:00
  • b2399243e3 Merge branch 'master' into LevelSystemAndSuch PlatinumSkink 2015-10-05 13:26:51 +02:00
  • 58407203fc Refinements in Niklas code bugfix PlatinumSkink 2015-10-05 13:09:02 +02:00
  • a8b0631379 Improved FPS counter with averaging Jace 2015-10-02 19:01:08 +02:00
  • b38580f468 Area and Stage numbers in the right place Jace 2015-10-02 18:30:36 +02:00
  • b86dc09c82 Merge branch 'master' into gui Jace 2015-10-02 18:18:44 +02:00
  • e74f1092c7 Fixed crash when events were (un)subscribed while events were processing Jace 2015-10-02 18:12:00 +02:00
  • 773c6665bd Particles working, still need some more variables implanted though tleety 2015-10-02 16:35:21 +02:00
  • dca06a46a5 Changed bool CPhysics->Static to enum CPhysics->CollisionType, Which added support for kinematic bodies viktorljung 2015-10-02 14:36:41 +02:00
  • 06c7245421 Removed my unnecessary RemoveComponents. PlatinumSkink 2015-10-02 14:28:35 +02:00
  • 0cffdadd33 Removed some couts. PlatinumSkink 2015-10-02 14:20:53 +02:00
  • 754356da1d Commit to enable pulling. PlatinumSkink 2015-10-02 13:06:44 +02:00
  • cf6f9866e7 Merge branch 'bugfix' of https://github.com/teamfisk/AgileBreakOut into bugfix PlatinumSkink 2015-10-01 15:47:12 +02:00
  • f45908647c Quick-Fix for Score Error when additional frames appeared PlatinumSkink 2015-10-01 15:46:58 +02:00
  • a1e49d75fb Merge branch 'Physics' into bugfix viktorljung 2015-10-01 15:15:10 +02:00
  • 0743d882b9 Merge branch 'gui' into bugfix Jace 2015-10-01 14:42:39 +02:00
  • 4c7714dd21 Merge branch 'LevelSystemAndSuch' into bugfix PlatinumSkink 2015-10-01 14:41:58 +02:00
  • 45f1d882ad Adding these two additional frames make the event broker break Jace 2015-10-01 14:41:55 +02:00
  • c821fbfc25 Futile attempts to fix memory corruption bug Jace 2015-10-01 16:12:53 +02:00
  • e120b09b84 Merge branch 'master' into LevelSystemAndSuch PlatinumSkink 2015-10-01 14:36:12 +02:00
  • a4065f734b Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut PlatinumSkink 2015-10-01 14:26:25 +02:00
  • 45711500f7 Merged tleety 2015-10-01 14:24:06 +02:00
  • 52dec86925 Particle system up and running, but with bugged rendering tleety 2015-10-01 14:14:51 +02:00
  • 074c53a82b Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut PlatinumSkink 2015-10-01 14:14:36 +02:00
  • 4d3428f125 HitLag has types in strings to send along to affect what systems lag. PlatinumSkink 2015-10-01 14:14:07 +02:00
  • 39f4215c2b Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-10-01 14:13:51 +02:00
  • cbaca42a3c Changed SquidModel viktorljung 2015-10-01 14:04:21 +02:00
  • ff27eafccf WORKING number frame Jace 2015-10-01 13:09:27 +02:00
  • b42a09fce1 Semi-working number frame Jace 2015-10-01 11:01:33 +02:00
  • d1dde9459f Added FPS counter Jace 2015-10-01 11:01:18 +02:00
  • cc1bc25914 Merge branch 'master' of github.com:teamfisk/AgileBreakOut Jace 2015-10-01 10:55:04 +02:00
  • e1ff3825ee Fixed type error in sound loading Jace 2015-10-01 12:51:29 +02:00
  • 842a112be8 Added Frame tests Jace 2015-10-01 10:53:46 +02:00
  • ba67f6ea37 Tests fixed into working order Jace 2015-10-01 10:53:29 +02:00
  • c63ec035a7 HitLagSystem implemented. PlatinumSkink 2015-09-30 16:42:35 +02:00
  • c31ff4cfcb P-button pauses, H-button does 0.3 second HitLag. PlatinumSkink 2015-09-30 15:19:45 +02:00
  • 2fb16357fa Moved pad-creation to PadSystem. Pad now stops at sides. PlatinumSkink 2015-09-30 10:32:17 +02:00
  • 2491dd8b74 Fixed some things, code up to styleguide tleety 2015-09-30 10:29:56 +02:00
  • 45e68c51a3 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch PlatinumSkink 2015-09-29 14:44:50 +02:00
  • c3b54ef030 Implemented Combos which multiply score. Adjusted pad a bit. PlatinumSkink 2015-09-29 14:42:01 +02:00
  • 97f9688303 deleted .orig Stiffly 2015-09-29 13:41:50 +02:00
  • 7733a44d53 Refactoring and starting to write test for PhysicsSystem viktorljung 2015-09-29 12:08:13 +02:00
  • cb70cdfc5d Merge remote-tracking branch 'origin/master' into Sound Stiffly 2015-09-29 12:04:52 +02:00
  • 94fc7c1ce6 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch. PlatinumSkink 2015-09-29 11:21:35 +02:00
  • a1c709a2db Removed wierd glow on water tleety 2015-09-29 11:10:08 +02:00
  • 3ab6c0c5ba Sound channel volume not overriding individual volume for sounds. Stiffly 2015-09-29 11:09:43 +02:00
  • 38d3a8c990 Fixed a bug where you could not have more than one particle group tleety 2015-09-29 10:27:57 +02:00
  • 5e7e5ec8bb Fixed precision loss in physics accumulator Jace 2015-09-28 22:55:39 +02:00
  • 5e0b0f920a Fixed your asset loading fuckups Jace 2015-09-28 22:46:35 +02:00
  • d472e2ae88 Added ignore rule for .orig files, since nobody seem to be able to look at what they commit... Jace 2015-09-28 21:56:11 +02:00
  • edd87ddf58 Fixed critical warnings for Linux build Jace 2015-09-28 20:40:28 +02:00
  • a97dae542d Merge remote-tracking branch 'origin/master' into Sound Stiffly 2015-09-28 18:14:06 +02:00
  • 7b7277509e CreateBall clones the original ball rather than create new balls. PlatinumSkink 2015-09-28 18:09:55 +02:00
  • f10749d220 Refactoring SoundSystem and its events, components Stiffly 2015-09-28 17:59:57 +02:00
  • fc41727a5d Transferred Ball-stuff into BallSystem. PlatinumSkink 2015-09-28 17:24:58 +02:00
  • 22c7663cc5 Merge branch 'master' into Physics viktorljung 2015-09-28 17:21:08 +02:00
  • 1a0201ee98 Style guide fixes viktorljung 2015-09-28 17:19:45 +02:00
  • 2d7703afad Header definitions added to style guide Jace 2015-09-28 17:17:24 +02:00
  • 90424b8d68 Merge branch 'master' into LevelSystemAndSuch PlatinumSkink 2015-09-28 15:06:37 +02:00
  • 7d9e3e00a4 Fixed out-of-range error in NumberFrame demo2 Jace 2015-09-25 08:23:41 +02:00