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

Commit Graph

  • be60464bb5 Merge branch 'master' of github.com:teamfisk/AgileBreakOut Jace 2015-09-25 05:47:37 +02:00
  • 17f8905696 Removed the HUD from the menu screen Jace 2015-09-25 05:47:20 +02:00
  • c459560bfa Fixed score not accumulating correctly viktorljung 2015-09-25 05:39:09 +02:00
  • ad299ad2e5 Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-09-25 05:34:00 +02:00
  • cb48b881b7 cool fixes and stuff viktorljung 2015-09-25 05:33:10 +02:00
  • 7b47385674 Working NumberFrame and score indicator Jace 2015-09-25 05:30:31 +02:00
  • a730a1ce16 Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-09-25 05:16:58 +02:00
  • 96511c63b1 Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-09-25 05:16:32 +02:00
  • 2af9567722 Merge branch 'master' of github.com:teamfisk/AgileBreakOut tleety 2015-09-25 04:40:51 +02:00
  • cfb6d1e4b5 Falling bricks and collision filters viktorljung 2015-09-25 04:28:46 +02:00
  • b77c357990 Changed some lighting and the background pipe scale tleety 2015-09-25 03:33:30 +02:00
  • 186e06bc22 Fixed bug where render queue wouldn't get cleared if the world wasn't running Jace 2015-09-25 03:23:42 +02:00
  • c0f77dd32a fixup! Merge branch 'master' of github.com:teamfisk/AgileBreakOut Jace 2015-09-25 03:10:47 +02:00
  • 8b3d9eb842 WIP HUD Jace 2015-09-25 03:02:08 +02:00
  • ecfa666a22 Merge branch 'master' of github.com:teamfisk/AgileBreakOut Jace 2015-09-25 03:04:13 +02:00
  • b0c19c74f2 Merge remote-tracking branch 'origin/master' into EGameStart EGameStart Stiffly 2015-09-25 02:49:50 +02:00
  • 650c7ec47c EStartGame up and running. Moved BGM-play from soundsystem init to EGameStart. Stiffly 2015-09-25 02:43:34 +02:00
  • d2bc91be48 Merge remote-tracking branch 'origin/master' into gui Jace 2015-09-25 02:27:00 +02:00
  • c9854d2b83 Working volume sliders! Jace 2015-09-25 01:53:28 +02:00
  • f79d5ec68b Merge remote-tracking branch 'origin/water' tleety 2015-09-25 01:51:33 +02:00
  • effc9ff781 Merge and some small fixes tleety 2015-09-25 01:49:08 +02:00
  • 5f1963b8bc Complete main menu without event bindings. Jace 2015-09-25 01:26:47 +02:00
  • b83de44715 Working GUI Button Jace 2015-09-23 16:51:20 +02:00
  • 8e00b76036 Error texture for texture frames when texture is missing Jace 2015-09-23 16:50:49 +02:00
  • e0b1747ca9 EventBroker::Clear renamed to Swap to cause less confusion Jace 2015-09-23 16:50:02 +02:00
  • 1d500eb4f6 First iteration of GUI code. GUI is rendered on top of everything, world still separate. Jace 2015-09-22 14:39:08 +02:00
  • 0e6fcfb2ba Merge remote-tracking branch 'origin/master' into Sound Stiffly 2015-09-25 01:03:28 +02:00
  • c624c5bcf3 Merge master tleety 2015-09-25 00:03:28 +02:00
  • d2301594ce Gravity scale per entity viktorljung 2015-09-25 00:01:24 +02:00
  • 181ac60bd0 MasterVolume now working due to previous refactoring. Stiffly 2015-09-24 23:41:41 +02:00
  • 118c0b3a24 Merge branch 'LevelSystemAndSuch' of https://github.com/teamfisk/AgileBreakOut into LevelSystemAndSuch PlatinumSkink 2015-09-24 23:23:48 +02:00
  • 0d521cdcc9 Refactoring. Splitting up storage and handling into SFX- and BGM sources. Stiffly 2015-09-24 23:21:55 +02:00
  • fa198cf953 Water now rendered in forward rendering tleety 2015-09-24 23:21:46 +02:00
  • e867722d9a Added logic for mastervolume. And a coresponding event. Stiffly 2015-09-24 22:55:24 +02:00
  • 1f73201943 Merge remote-tracking branch 'origin/master' into Sound Stiffly 2015-09-24 20:55:26 +02:00
  • bc6b037923 Added submarine pad viktorljung 2015-09-24 20:54:57 +02:00
  • e7806165b4 Merged Master into Sound. viktorljung 2015-09-24 20:31:47 +02:00
  • 89555fa0aa Merge remote-tracking branch 'origin/master' into Benchmarking Benchmarking Stiffly 2015-09-24 20:41:53 +02:00
  • c98887fa68 Time metrics for the Update-functions in Enginge::Tick(). Stiffly 2015-09-24 20:34:21 +02:00
  • 72413dc0a9 Added submarine model and texture files viktorljung 2015-09-24 20:31:47 +02:00
  • 8bf10d4517 Removed Stage Reset and Life Display. PlatinumSkink 2015-09-24 18:58:34 +02:00
  • 4e4ba29666 Remove Components upon removing entities, a lot of strange experimenting to remove frozen squid bug. PlatinumSkink 2015-09-24 18:14:39 +02:00
  • 14d133bd31 Metrics for individual systems. Press N Stiffly 2015-09-24 17:25:14 +02:00
  • ef3591ba46 Water threshhold added, now it's actually waterlike tleety 2015-09-24 16:23:57 +02:00
  • a1215d71e9 Water now blurred and looking kinda water like tleety 2015-09-24 16:10:13 +02:00
  • 62b17e3dbf Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge. PlatinumSkink 2015-09-23 20:46:57 +02:00
  • d473e3711c Now render water through it's own buffer. Not currently visable through finaltexture. Also added a white texture to render the water. tleety 2015-09-23 18:01:15 +02:00
  • 086bdbce70 Accumulated measures of Events, Update, Recursive Updates. Stiffly 2015-09-23 17:19:57 +02:00
  • bbec676683 Merged master into LevelSystemAndSuch. Now let's see if it works. PlatinumSkink 2015-09-23 16:05:07 +02:00
  • edc25e59f0 Start of Rescaling 10:16 PlatinumSkink 2015-09-23 15:59:48 +02:00
  • 4e429bc48c Fixed remove ball bug viktorljung 2015-09-23 15:55:50 +02:00
  • 2cf54819ae Printing some numbers Stiffly 2015-09-23 15:37:14 +02:00
  • af22c84066 removed the test box viktorljung 2015-09-23 15:24:41 +02:00
  • 56549cdf0a Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-09-23 15:21:28 +02:00
  • 683b4cc3cf Printing system names. Stiffly 2015-09-23 15:17:20 +02:00
  • e8e74eb506 Added pitch Stiffly 2015-09-23 15:15:43 +02:00
  • 08d653b0b0 Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-09-23 15:14:16 +02:00
  • 03e2078cfb Pad modifies ball path and ball facing its direction viktorljung 2015-09-23 15:12:18 +02:00
  • 1b0d87e862 Adjusted Power-Up Code PlatinumSkink 2015-09-23 14:23:41 +02:00
  • 346ee13dd5 Stop sound event up and running. Stiffly 2015-09-23 14:14:11 +02:00
  • 4f341250d7 Updated playsound events. Stiffly 2015-09-23 12:08:05 +02:00
  • 8e2eb63c5e Added renderQueue for water and created buffers for the water to use. tleety 2015-09-23 12:07:28 +02:00
  • f6b6f05c37 CPowerUpBrick + CPowerUp exists. Can drop from brick and be grabbed for MultiBall. PlatinumSkink 2015-09-22 17:55:12 +02:00
  • a010a8be77 Clean-up sources. Stiffly 2015-09-22 17:44:40 +02:00
  • 5b6556e9fb Fixed OpenAL Clean-up device. Added playBGM-event. Stiffly 2015-09-22 16:56:53 +02:00
  • 94401a10ee Water working, might not work for several bodies tleety 2015-09-22 16:06:47 +02:00
  • 2797a0f6c3 Merge branch 'master' into LevelSystemAndSuch PlatinumSkink 2015-09-22 14:49:50 +02:00
  • 3f4ede4b7d OpenAL fixed. CMake path set correctly. Stiffly 2015-09-22 14:32:04 +02:00
  • 1e70e151ee Continued work on water, can now get 1 particle? maybe? Gotta get rendering to work so i can test it. tleety 2015-09-21 16:00:20 +02:00
  • 7e9e19039c removing unnecessary print Stiffly 2015-09-21 14:49:47 +02:00
  • dbb04c83af Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch PlatinumSkink 2015-09-21 13:27:54 +02:00
  • 460c7042bf MultiBalls appear depending on pad's position PlatinumSkink 2015-09-21 13:25:20 +02:00
  • 761631c4a6 m-button is MultiBall powerup. Still needs fine-tuning. PlatinumSkink 2015-09-17 18:09:22 +02:00
  • 2a4c7c8b1a Resourcing working on sounds. Added class Sound resource. Stiffly 2015-09-17 17:50:00 +02:00
  • b32934dba6 Merge remote-tracking branch 'origin/physics' into water tleety 2015-09-17 17:37:58 +02:00
  • b69413d9c9 Base water set up tleety 2015-09-17 17:35:17 +02:00
  • 8ca01ae9c7 Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-09-17 17:11:37 +02:00
  • c0155b7900 collisions remade viktorljung 2015-09-17 16:52:43 +02:00
  • 1f83ef7e89 I was copying Frame, MainMenuFrame, TextureFrame... FrameAttempt PlatinumSkink 2015-09-17 16:46:15 +02:00
  • 66abc11735 I lied. Now it is restored. PlatinumSkink 2015-09-17 15:48:34 +02:00
  • f6721986c7 Merge branch 'master' into FrameAttempt PlatinumSkink 2015-09-17 15:45:08 +02:00
  • 587b712f49 Merge remote-tracking branch 'origin/master' into Sound Stiffly 2015-09-17 15:41:36 +02:00
  • 53a9cbd4d8 Restored to try anew. PlatinumSkink 2015-09-17 15:41:25 +02:00
  • 4dd8ac8445 Added Component to bricks to emitt sound. Improved code for playing a sound Stiffly 2015-09-17 15:41:08 +02:00
  • b3335cff05 Didn't work. Let's try again. PlatinumSkink 2015-09-17 15:28:57 +02:00
  • 442554812d Collisions kind of working viktorljung 2015-09-17 14:11:09 +01:00
  • 6671136a08 Made a Sound folder. Rename class Sound to SoundSystem. Stiffly 2015-09-17 14:42:33 +02:00
  • 692e0ca9df Fixed a bug where models normal and specular maps is not loaded. GLrenderer tleety 2015-09-17 14:37:00 +02:00
  • 250e70ff50 removing some heavy sound files for you guys Stiffly 2015-09-17 13:27:31 +02:00
  • 953be0cda9 Merge remote-tracking branch 'origin/master' into Sound Stiffly 2015-09-17 13:18:56 +02:00
  • 13de4bd1cb Added sound files. Listens to collision events -> play sound. Stiffly 2015-09-16 16:54:02 +02:00
  • bc5a5e5e92 Adjusted model and position of displayed lives. PlatinumSkink 2015-09-16 16:49:52 +02:00
  • bdba34e8e1 Reset ball is also octopus. PlatinumSkink 2015-09-16 16:35:41 +02:00
  • 30ee6c2430 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch PlatinumSkink 2015-09-16 16:29:57 +02:00
  • dcb23bd199 Frame needs GameFrame, TextureFrame and Viewport to work. PlatinumSkink 2015-09-16 16:28:49 +02:00
  • c311408346 Ball size fix tleety 2015-09-16 16:23:59 +02:00
  • a5ffce8db8 Merge remote-tracking branch 'origin/master' into GLrenderer tleety 2015-09-16 16:17:39 +02:00
  • 12273f66af Ball size fix tleety 2015-09-16 16:17:02 +02:00
  • 825f6dc991 Models now get a standard normal and specular map if they dont have one tleety 2015-09-16 16:09:20 +02:00
  • 8f513e3281 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch PlatinumSkink 2015-09-16 15:49:36 +02:00