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

Commit Graph

  • 36043010af wip for shadows FakeShemp 2016-02-10 20:51:33 +01:00
  • 6396925b68 Merge remote-tracking branch 'origin/Animations' into WeaponSystem Jace 2016-02-10 20:47:33 +01:00
  • a53ab7f745 A few fixes for DashAbility. Default DoubleTapToDash is now set to false. verysecrethero 2016-02-10 20:46:16 +01:00
  • 224e95f34a Fixed BoneAttachment component and optimized animation code a bit viktorljung 2016-02-10 20:45:24 +01:00
  • 95fa1f4bbd Connect Fix for TCP Client Jocke 2016-02-10 20:10:20 +01:00
  • 2cae4e3fb2 Merge remote-tracking branch 'origin/master' into Menu Tleety 2016-02-10 19:52:42 +01:00
  • 0825b10c75 Merge remote-tracking branch 'origin/master' into WeaponSystem Jace 2016-02-10 19:21:30 +01:00
  • ed06eacf6f Merge pull request #91 from teamfisk/Sound Jace 2016-02-10 19:16:45 +01:00
  • 3c3149b13e Merge pull request #90 from teamfisk/FrustumCulling Jace 2016-02-10 19:16:36 +01:00
  • 67cf008122 Bug fixing. FrustumCulling William Moberg 2016-02-10 18:03:58 +01:00
  • 53265bbc90 PNG is now a resource. Tleety 2016-02-10 17:50:17 +01:00
  • 7cbdc33f84 Updated submodules Jocke 2016-02-10 17:39:23 +01:00
  • 8520192805 Merge remote-tracking branch 'origin/master' into Sound stiffly 2016-02-10 17:17:58 +01:00
  • 1ba9d97ab7 Fixed crash when trying to jump, when no player is spawned. stiffly 2016-02-10 17:17:41 +01:00
  • fa781d5c88 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer Teejoon 2016-02-10 17:16:14 +01:00
  • 97780395cf ... Now mipmaps and Splatmaps i comming :) Teejoon 2016-02-10 17:15:54 +01:00
  • b0bdca5cdd SplatMap räknas rätt ny och mitmaps i Texture.cpp Teejoon 2016-02-10 17:15:08 +01:00
  • 9645169797 Merge remote-tracking branch 'origin/master' into TCPConnections Jocke 2016-02-10 17:05:07 +01:00
  • 02cd822cf1 Tiny test refactoring verysecrethero 2016-02-10 17:04:05 +01:00
  • 2c0f66d9c7 Merge remote-tracking branch 'origin/master' into WeaponSystem Jace 2016-02-10 14:49:03 +01:00
  • f7756ff60f Tiny refactoring of PickupSpawnTest. Updated and fixed HealthSystemTest. verysecrethero 2016-02-10 16:51:00 +01:00
  • 2d5f71e442 Added 3 PickupSpawnSystem tests. verysecrethero 2016-02-10 16:25:47 +01:00
  • 4f2ad3ad00 Reliable message should now be working, further testing is to be done. Jocke 2016-02-10 16:16:56 +01:00
  • cb77c1ff97 Working pcf, not optimized FakeShemp 2016-02-10 16:16:41 +01:00
  • 27cdccac75 Frustrum octree should only get AABBs derived from Model now. William Moberg 2016-02-10 16:10:41 +01:00
  • 646806b50e New Map with meshes WIP antc13 2016-02-10 15:40:59 +01:00
  • 69db32337d Shado wip FakeShemp 2016-02-10 15:16:58 +01:00
  • b2d35c80f7 Merge branch 'master' into FrustumCulling William Moberg 2016-02-10 15:08:40 +01:00
  • 04c23be136 Merge remote-tracking branch 'origin/master' into Menu Tleety 2016-02-10 15:01:51 +01:00
  • f3a76eb13e Explosion effects should get a proper sized AABB. William Moberg 2016-02-10 15:00:13 +01:00
  • b81f2b3240 WIP Bloom BloomImprovement Tleety 2016-02-10 15:00:12 +01:00
  • d931660c56 WIP Jace 2016-02-10 01:16:38 +01:00
  • 019e85a425 Merge pull request #89 from teamfisk/Animations Jace 2016-02-10 14:40:23 +01:00
  • 61275274f7 Commited this viktorljung 2016-02-10 14:39:45 +01:00
  • e9d36c48a6 Changed isSkined to IsSkinned and removed duplicated code in PickingPass viktorljung 2016-02-10 14:36:25 +01:00
  • 1e238b2407 Changed asset branch viktorljung 2016-02-10 14:28:25 +01:00
  • 2f53ed140f Merge remote-tracking branch 'origin/master' into AssaultBoost verysecrethero 2016-02-10 14:16:55 +01:00
  • 1ebe174b94 Merge pull request #88 from teamfisk/Sound verysecrethero 2016-02-10 14:14:47 +01:00
  • 08328a781c Merge remote-tracking branch 'origin/master' into Animations viktorljung 2016-02-10 14:13:08 +01:00
  • c2128790af Now using appropriate variable to see if a player is on ground. Does not check if playervel.y == 0 which will be false if a player is on a obstacle. stiffly 2016-02-10 14:07:11 +01:00
  • afebf879a0 Merge fixes viktorljung 2016-02-10 13:44:47 +01:00
  • 86f4ff0b3c Added an annotation for Trigger and Collideable components. William Moberg 2016-02-10 12:38:36 +01:00
  • 645ee9013a Merge pull request #85 from teamfisk/FrustumCulling Jace 2016-02-10 12:35:24 +01:00
  • 4a5ab048bd Merge pull request #86 from teamfisk/Sound Jace 2016-02-10 12:33:01 +01:00
  • b6b96c5f11 Added DoubleJumpHexagon entity. Spawned DoubleJumpHexagon as the player doublejumps. Fixed DoubleJumping bug where you couldnt doublejump on rocks (where velocity wasnt 0.0) verysecrethero 2016-02-10 11:51:58 +01:00
  • 6af167675d Shadow WIP stage 2 Ayumiwii 2016-02-10 11:48:44 +01:00
  • f6a7b8ea0c Merge remote-tracking branch 'origin/master' into Sound stiffly 2016-02-10 11:37:17 +01:00
  • 3d2f9fa79d Drum sounds does not start every single time a TriggerTouch happens. Specific and temporary logic for play test. stiffly 2016-02-10 11:36:54 +01:00
  • 49e6252ee1 Merge remote-tracking branch 'origin/master' into Animations viktorljung 2016-02-10 11:33:45 +01:00
  • 2ec30fd2b2 Cleaned up code and fixed crash when closing client before server when using udp. Jocke 2016-02-10 11:28:03 +01:00
  • 97be22c4a5 Skinned transparent model Picking fixed viktorljung 2016-02-10 11:22:05 +01:00
  • 94ff12cf66 When using a PlaySoundOnEntity Event, you no longer have to provide the child of an entity as parameter. stiffly 2016-02-10 11:04:18 +01:00
  • 0bbb627790 Merge branch 'master' into FrustumCulling William Moberg 2016-02-10 11:04:31 +01:00
  • 2c48c2680f Cleanup viktorljung 2016-02-10 11:04:28 +01:00
  • 09bb42b3f4 Importer animation fix viktorljung 2016-02-10 11:00:44 +01:00
  • d65ce805a5 FrustumOctree has its own system, won't cull away explosion effects. William Moberg 2016-02-10 10:53:25 +01:00
  • 03d77beff9 MipMapping all textures Tleety 2016-02-10 10:46:27 +01:00
  • 067780c93f Merge pull request #83 from teamfisk/DefenderShield Jace 2016-02-10 10:33:36 +01:00
  • 90192e016a Merge pull request #82 from teamfisk/BoxModelCollision Jace 2016-02-10 10:08:54 +01:00
  • 5cea3bed3a Work in progress weapon system Jace 2016-02-09 23:27:04 +01:00
  • daa96baab5 BoneAttachmentSystem fix for not having a skeleton viktorljung 2016-02-09 23:03:49 +01:00
  • 001e2441dd Mergefixes viktorljung 2016-02-09 22:54:51 +01:00
  • c09c2f4783 Merge remote-tracking branch 'origin/Importer' into Animations viktorljung 2016-02-09 22:50:19 +01:00
  • 3c22dcc165 changed assetbranch viktorljung 2016-02-09 22:34:09 +01:00
  • 7212217460 Added animation blending and offset animation component viktorljung 2016-02-09 22:15:43 +01:00
  • d83190290f Server now broadcasts certain input commands to all other clients (for stuff like shooting) Jace 2016-02-09 19:37:42 +01:00
  • d5647ce89c Working 1-snapshot interpolation Jace 2016-02-09 16:08:28 +01:00
  • ecfacee587 Undo debug test code. William Moberg 2016-02-09 19:33:28 +01:00
  • a93ccecfeb Debug test code. William Moberg 2016-02-09 19:23:12 +01:00
  • 7140b740b5 Models/Collideables/etc. won't need a AABB component anymore, if it has a Model component. In addition, they should take rotation into account, i.e it doesn't have to be axis-aligned. William Moberg 2016-02-09 19:20:04 +01:00
  • d2ed293183 Network is now working as udp or tcp. Next step is making the hybrid. Jocke 2016-02-09 19:14:56 +01:00
  • 830e0f66c9 Tiny: Changed warning message. William Moberg 2016-02-09 17:21:10 +01:00
  • eec59a40c8 Nitpicks. William Moberg 2016-02-09 17:19:39 +01:00
  • 239a8e7a6a Frustum culling should be working. William Moberg 2016-02-09 17:12:23 +01:00
  • e9f5a3d263 Renamed some files from temporary filenames to DamageIndicator filenames verysecrethero 2016-02-09 16:28:43 +01:00
  • 64e7bb1e94 Good looking blur, need some fixes, but framerates takes a huge hit. Tleety 2016-02-09 16:19:17 +01:00
  • 8bdf87da12 Some cleanup of the code verysecrethero 2016-02-09 16:15:19 +01:00
  • ecd823cb9f Shadow WIP stage 2 Ayumiwii 2016-02-09 16:15:11 +01:00
  • 232bf66a09 Jump height is constant for the double jump. William Moberg 2016-02-09 16:09:08 +01:00
  • e69864680d PlayerMovementSystem now only updates the velocity of the local player, as it should Jace 2016-02-09 16:08:06 +01:00
  • c69a80f5ba Added System::LocalPlayer that is always set to the entity which is the local player, available to all systems. Jace 2016-02-09 16:06:39 +01:00
  • 971fee4a0c DamageIndicatorSystem code looking good. Test working well. Sprite display fixed by Viktor verysecrethero 2016-02-09 15:38:21 +01:00
  • b9d6d59c62 Merge branch 'BoxModelCollision' into FrustumCulling William Moberg 2016-02-09 15:03:13 +01:00
  • b30891aecd WIP, debugging code added, still not working. William Moberg 2016-02-09 15:00:30 +01:00
  • 847c539373 Fix viewport FakeShemp 2016-02-09 14:44:12 +01:00
  • cb7f06573f Shadows stage 2 WIP Ayumiwii 2016-02-09 14:08:57 +01:00
  • d3bc48f5f7 Major networking refactoring to allow for snapshot filtering outside of netcode Jace 2016-02-09 13:22:21 +01:00
  • fccd8c64e7 WIP Clients are working properly, servers are not. Jocke 2016-02-09 11:43:16 +01:00
  • b748deb1e1 WIP FrustumCulling, most code added but not working now. William Moberg 2016-02-09 10:05:49 +01:00
  • 0e9fb16399 Work started on DamageIndicatorSystem. Made some initial tests and test calculations verysecrethero 2016-02-08 17:58:07 +01:00
  • a33cd42ca3 WIP Tleety 2016-02-08 17:53:31 +01:00
  • 060e674a6f Picking supports skinned meshes Teejoon 2016-02-08 17:37:18 +01:00
  • 2c64ffc3d1 No longer using a variable to see if we're in editor mode. stiffly 2016-02-08 16:52:35 +01:00
  • aa5878d6df Used config for soundsystem properties. stiffly 2016-02-08 16:40:13 +01:00
  • 7752832ce5 No longer needs this walk logic in SoundSystem stiffly 2016-02-08 16:21:49 +01:00
  • 6f163bf3a3 Fixed bug where it crashed on respawn. Also bug where i subscribed to an event twice. stiffly 2016-02-08 16:13:09 +01:00
  • f3aba6748b Warning fixes. Warnings-Tobias Tleety 2016-02-08 16:02:23 +01:00
  • 9055d5f697 Bugfix Tleety 2016-02-08 15:22:28 +01:00
  • db5301ff2c Merge remote-tracking branch 'origin/Menu' into DamageIndicator verysecrethero 2016-02-08 15:03:45 +01:00
  • 93c6f3c0a3 AABBs are auto attached when adding Trigger/Collideable/etc, also added AttachComponent method to ComponentWrapper. William Moberg 2016-02-08 14:34:37 +01:00