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

Commit Graph

  • b83d773627 Infinite respawning for now Jace 2016-01-23 15:06:41 +01:00
  • d59ab5aba2 Merge pull request #43 from teamfisk/Forward+ Viktor Ljung 2016-01-23 14:58:10 +01:00
  • 680a12d88f HealthMeter viktorljung 2016-01-23 14:53:17 +01:00
  • f623232a2b Removed a temp variable. Tleety 2016-01-23 14:52:29 +01:00
  • 71404c8828 Special case for collision vs ground (upward facing) triangles. William Moberg 2016-01-23 14:01:54 +01:00
  • 6a18cb88af Merge remote-tracking branch 'origin/master' into Forward+ Tleety 2016-01-23 13:59:21 +01:00
  • b499f4b020 Fixed some rendering bugs and some code refactoring Tleety 2016-01-23 12:17:38 +01:00
  • 482689fd48 fixup! Moved FirstPersonInputController implementation out of header Jace 2016-01-23 12:16:40 +01:00
  • 32f73201c5 Basic jumping! AdvancedPlayerMovement Jace 2016-01-23 12:15:24 +01:00
  • 3aeeb3cad5 Moved FirstPersonInputController implementation out of header Jace 2016-01-23 11:54:03 +01:00
  • 4d5cbb6057 fixup! Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky Jace 2016-01-23 12:14:00 +01:00
  • bef95235d0 Merge pull request #41 from teamfisk/TextRendering Jace 2016-01-23 11:51:11 +01:00
  • 9a23d8887a Merge remote-tracking branch 'origin/master' into TextRendering viktorljung 2016-01-23 11:48:10 +01:00
  • db0e67b9bd Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky Jace 2016-01-23 11:44:16 +01:00
  • e4513376bb fixup! Changed name and made a TextPassState viktorljung 2016-01-23 11:39:10 +01:00
  • 445248af55 Changed name and made a TextPassState viktorljung 2016-01-23 11:38:31 +01:00
  • 64a7239b17 Merge pull request #46 from teamfisk/CapturePointCrashFixBranch Jace 2016-01-23 11:10:57 +01:00
  • 3974c649ab WIP on ModelBoxCollision. Octree works in Release mode. William Moberg 2016-01-23 10:45:50 +01:00
  • 31e7340daf Ignoring interpolation and rendering for local player entities! Jace 2016-01-23 00:40:18 +01:00
  • 3ac3311c0c "inline" caused missing symbol when compiling in Release for some reason Jace 2016-01-23 00:37:47 +01:00
  • 90867b094a Merge remote-tracking branch 'origin/TextRendering' into Networking Jace 2016-01-22 22:08:56 +01:00
  • 55ee2bb3bf Player input properly separated from editor input and server Jace 2016-01-22 21:35:31 +01:00
  • 406b730ef3 Sends entity names. Temporarily stiffly 2016-01-22 19:07:20 +01:00
  • b37b20b7d8 Didn't bulid lol. Fixed. stiffly 2016-01-22 17:57:31 +01:00
  • 750442d224 Merge remote-tracking branch 'origin/Networking' into Networking stiffly 2016-01-22 17:49:56 +01:00
  • 389e057611 EPlayerSpawned special logic added to server and client. stiffly 2016-01-22 17:49:21 +01:00
  • 74d9bae896 Added conditional spawning based on whether the running instance is a server or not Jace 2016-01-22 17:34:57 +01:00
  • 46dff1a59c Merge remote-tracking branch 'origin/master' into Menu viktorljung 2016-01-22 17:02:56 +01:00
  • 1b0cc1d80b Add normal map support NormalMaps FakeShemp 2016-01-22 16:41:20 +01:00
  • 74c95089ea Merge remote-tracking branch 'origin/PlayerMovement' into Networking stiffly 2016-01-22 16:19:35 +01:00
  • ca2aab449e Basic movement and camera management between players and editor Jace 2016-01-22 16:12:51 +01:00
  • 7498cebf5e Merge remote-tracking branch 'origin/master' into Forward+ Tleety 2016-01-22 15:57:38 +01:00
  • 2b8debbfff Added MipMap texture generation Tleety 2016-01-22 15:55:32 +01:00
  • 08c476e9e3 Added kick logic to the server. Also typedefed. stiffly 2016-01-22 15:42:36 +01:00
  • 1670fb4e48 Moved triangle vs ray code to method. William Moberg 2016-01-22 14:45:50 +01:00
  • 3955e1d60c Can resolve collision when AABB corners cut through triangle. William Moberg 2016-01-22 13:46:09 +01:00
  • 10c3b475bf Merge remote-tracking branch 'origin/Networking' into Networking stiffly 2016-01-22 13:19:51 +01:00
  • 08fcdb382b Used config for a lot of things stiffly 2016-01-22 11:53:04 +01:00
  • b1ea5429ce Used config for a lot of things stiffly 2016-01-22 11:53:04 +01:00
  • d25804e6f8 Merge branch 'master' into BoxModelCollision William Moberg 2016-01-22 11:24:19 +01:00
  • 52765cc85b TriangleVsBox detection seems to work in all cases, but cannot resolve all cases yet. William Moberg 2016-01-22 11:22:56 +01:00
  • fcc9d64e7a Now publishes an EPlayerDisconnected event stiffly 2016-01-22 10:58:10 +01:00
  • caf55fb8d1 Small fix to the bloom light, now feels smoother. Tleety 2016-01-22 10:52:45 +01:00
  • 7a95880e10 Merge remote-tracking branch 'origin/master' into Networking stiffly 2016-01-22 10:36:11 +01:00
  • 6cd073c3c8 Added network metrics logging and reactored code. Jocke 2016-01-22 10:32:54 +01:00
  • 1e3fc1ae2d Created EPlayerSpawned that gets published when a player spawns Jace 2016-01-22 10:16:35 +01:00
  • 6f739e22f3 Crash fix for: if you delete a team component in editor. CapturePointCrashFixBranch verysecrethero 2016-01-22 10:10:39 +01:00
  • 8cf83454d7 Fixed input going through editor UI Jace 2016-01-21 17:45:20 +01:00
  • d2984c6ae4 Merge branch 'master' into BoxModelCollision William Moberg 2016-01-21 17:42:58 +01:00
  • 41f0daaf3f Merge pull request #45 from teamfisk/ShootEvent William Moberg 2016-01-21 17:40:57 +01:00
  • deb6ff1b16 Changed some files so it works with the changes in master. (weaponsystem,capturepoint,some tests) ShootEvent verysecrethero 2016-01-21 17:36:47 +01:00
  • 9f6fa40448 Merge branch 'master' into BoxModelCollision William Moberg 2016-01-21 17:16:55 +01:00
  • de7c8e9234 WIP, collision detects too much, no resolving for most cases. William Moberg 2016-01-21 17:10:36 +01:00
  • 4d60f387ed Merge pull request #44 from teamfisk/EditorUsefulness William Moberg 2016-01-21 17:03:52 +01:00
  • f740d46683 Merge branch 'EditorUsefulness' of github.com:teamfisk/TacticalZ into EditorUsefulness Jace 2016-01-21 17:01:06 +01:00
  • 75dcdcec41 Fixed inconsistent editor input controls. Left mouse = select and move. Right mouse = camera. Jace 2016-01-21 17:00:47 +01:00
  • 254caf9e5d Picking depthbuffer fix viktorljung 2016-01-21 16:49:20 +01:00
  • 1c6750f5b0 Fixed uniform scale on editor widgets Jace 2016-01-21 16:37:35 +01:00
  • 3548cfa248 Merge pull request #27 from teamfisk/ShootEvent William Moberg 2016-01-21 16:35:55 +01:00
  • 973ccd34c9 Removed unnecessary string in EPlayerDamage (TypeOfDamage). Renamed a variable in WeaponSystem verysecrethero 2016-01-21 16:30:07 +01:00
  • 43b8fd29f6 Fixed widget world movement Jace 2016-01-21 16:21:20 +01:00
  • a6548a72b3 Merge remote-tracking branch 'origin/master' into EditorUsefulness Jace 2016-01-21 16:05:08 +01:00
  • 7deb32431e Removed Color TestCode in WeaponSystem verysecrethero 2016-01-21 16:03:30 +01:00
  • fc06a4babc Editor keyboard shortcuts: Jace 2016-01-21 15:58:27 +01:00
  • 382e00cff4 Randomness fixed Ayumiwii 2016-01-21 15:34:08 +01:00
  • c6e9aad0c7 Merge pull request #42 from teamfisk/SpawnMiniBranch Tobias Dahl 2016-01-21 15:10:16 +01:00
  • afe43c5f44 Shader will now handle Glowmaps. However the load code is not there yet. Tleety 2016-01-21 14:53:47 +01:00
  • 2381f01d12 HealthSystem now deletes the entity after publishing the PlayerDeath event SpawnMiniBranch verysecrethero 2016-01-21 14:25:01 +01:00
  • b9147344e1 Semi-working translation widget Jace 2016-01-21 14:14:22 +01:00
  • 70bbc5ed0a Normals scaling with model scale bug fixed. Tleety 2016-01-21 13:52:43 +01:00
  • 0183e1bdb7 Fixed enum string parsing bug that would ignore parsing additional fields in a component after it encountered the first enum. Jace 2016-01-21 12:24:08 +01:00
  • 983f90504d Bloom effect added, will have to see if it needs improving. Also added HDR colors and gamma correction. Tleety 2016-01-21 12:02:28 +01:00
  • bdebc9de62 WeaponSystem now handles "PrimaryFire" input events. It sends out ePlayerDamage event if it hits a player. Included some tests verysecrethero 2016-01-21 11:55:51 +01:00
  • f1345419b6 EditorWidgetSystem that takes care of moving widgets around Jace 2016-01-21 10:30:19 +01:00
  • 5e70d6eef6 EntityWrapper::Parent helper function Jace 2016-01-21 10:29:48 +01:00
  • 4aa9100c69 Camera::WorldToScreen helper function Jace 2016-01-21 10:29:36 +01:00
  • 7b34e001ba Merge remote-tracking branch 'origin/master' into ShootEvent verysecrethero 2016-01-21 10:26:42 +01:00
  • c2e05de89f Deleted some components, etc for ShootEvent that will likely be used in a WeaponSystem instead verysecrethero 2016-01-21 10:24:34 +01:00
  • ea9c4d19d0 Merge remote-tracking branch 'origin/master' into TextRendering viktorljung 2016-01-21 10:19:32 +01:00
  • f3bfe388af Clean up viktorljung 2016-01-21 10:16:03 +01:00
  • 70cab9ef30 Merge pull request #40 from teamfisk/Networking Jace 2016-01-21 10:03:44 +01:00
  • f1a54a89b3 Merge pull request #37 from teamfisk/OctTree Jace 2016-01-21 09:57:46 +01:00
  • c984f76b2f Importing & Reading Custom animation data. TODO: Shaders. antc13 2016-01-20 18:36:03 +01:00
  • b098bd2bd3 Merge remote-tracking branch 'origin/master' into ShootEvent verysecrethero 2016-01-20 17:53:33 +01:00
  • 60037c2849 Merge pull request #31 from teamfisk/CapturePointTake William Moberg 2016-01-20 17:43:20 +01:00
  • cd67253173 Added logic to go from spectator to player. Jocke 2016-01-20 17:41:16 +01:00
  • a596b8746b CapturePointTimers are now reset for "inactive" CapturePoints after a capture. verysecrethero 2016-01-20 17:32:20 +01:00
  • 4d5b835352 WIP triangles vs. AABB. William Moberg 2016-01-20 16:43:09 +01:00
  • 35876f6425 Removed membervariable m_NextPossibleCapturePointand added it as local instead verysecrethero 2016-01-20 16:37:10 +01:00
  • f6ce98249e Merge remote-tracking branch 'origin/master' into CapturePointTake verysecrethero 2016-01-20 16:32:14 +01:00
  • 00588b07c5 Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking Jocke 2016-01-20 16:30:12 +01:00
  • 3376f4a16e Added server has timed out logic to client. (>'')> stiffly 2016-01-20 16:27:53 +01:00
  • 25d2aa3464 "Supporting" spectators. Using a vector for connected units as we do not interpret as players. ““”̿ ̿ ̿ ̿ ̿’̿’̵͇̿̿з=(•̪●)=ε/̵͇̿̿/̿ ̿ ̿ ̿ ̿’““ Jocke 2016-01-20 16:27:23 +01:00
  • 29aefc5af2 Added some more visual CaptureTestState xml files verysecrethero 2016-01-20 16:06:35 +01:00
  • 39ae83efd4 Fixed all tests in CapturePointTest and cleaned up some comments verysecrethero 2016-01-20 15:40:56 +01:00
  • 86824f1b1f Colors above value 1 is now added to the bloomtexture, and will be used to get a glow effect in later stage. Tleety 2016-01-20 15:23:49 +01:00
  • 8189e3c00c Logic in CapturePointSystem is working again. Need to update all Tests! verysecrethero 2016-01-20 14:59:18 +01:00
  • 4d01cdf895 Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking Jocke 2016-01-20 14:33:17 +01:00
  • 7e7ca7edcf Listening to "DisconnectFromServer" stiffly 2016-01-20 14:32:04 +01:00
  • e9a576341e Started on server disconnect logic. Jocke 2016-01-20 14:31:50 +01:00