0bbb627790
Merge branch 'master' into FrustumCulling
2016-02-10 11:04:31 +01:00
d65ce805a5
FrustumOctree has its own system, won't cull away explosion effects.
2016-02-10 10:53:25 +01:00
Jace
067780c93f
Merge pull request #83 from teamfisk/DefenderShield
...
Defender shield
2016-02-10 10:33:36 +01:00
Jace
90192e016a
Merge pull request #82 from teamfisk/BoxModelCollision
...
Small fixes to collision/trigger-boxes, etc.
2016-02-10 10:08:54 +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.
2016-02-09 19:20:04 +01:00
eec59a40c8
Nitpicks.
2016-02-09 17:19:39 +01:00
239a8e7a6a
Frustum culling should be working.
2016-02-09 17:12:23 +01:00
b9d6d59c62
Merge branch 'BoxModelCollision' into FrustumCulling
...
# Conflicts:
# src/Game/Game.cpp
2016-02-09 15:03:13 +01:00
b30891aecd
WIP, debugging code added, still not working.
2016-02-09 15:00:30 +01:00
b748deb1e1
WIP FrustumCulling, most code added but not working now.
2016-02-09 10:05:49 +01:00
93c6f3c0a3
AABBs are auto attached when adding Trigger/Collideable/etc, also added AttachComponent method to ComponentWrapper.
2016-02-08 14:34:37 +01:00
11cf85cc73
Renamed CollidableOctreeSystem to FillOctreeSystem.
2016-02-08 14:17:19 +01:00
971beb29d8
Merge remote-tracking branch 'origin/master' into DefenderShield
...
# Conflicts:
# resources/Schema/Components.xsd
2016-02-08 12:30:41 +01:00
5987751add
Merge pull request #81 from teamfisk/HealthPickup
...
Health pickup
2016-02-08 11:50:47 +01:00
94b59af973
Defender shield should now be working
2016-02-08 11:47:35 +01:00
Jace
70f8237a16
Merge pull request #60 from teamfisk/3rdPersonDeathCam
...
3rd person death cam
2016-02-08 11:39:57 +01:00
Jace
35b0193f15
Merge pull request #72 from teamfisk/BoxModelCollision
...
Collision in test phase
2016-02-08 10:29:41 +01:00
f8e514d21e
Merge remote-tracking branch 'origin/master' into HealthPickup
2016-02-08 10:22:35 +01:00
fad25c6e16
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
...
# Conflicts:
# include/Engine/Core/EPlayerHealthPickup.h
2016-02-08 10:21:30 +01:00
4103c878ec
Refactoring: Changed HealthPickupSystem to use a struct instead. Removed the Id in EPickupSpawned
2016-02-05 18:05:46 +01:00
be628d9406
Merge remote-tracking branch 'origin/master' into HealthPickup
...
# Conflicts:
# resources/Schema/Components.xsd
2016-02-05 16:23:22 +01:00
2542397511
Miscellaneous small fixes: For Tests, CapturePoint xml file, HealthSystem, DashAbility xml file.
2016-02-05 15:35:51 +01:00
fe6fd0bbe3
PickupSpawnSystem now spawns a new HealthPickup after the respawnTimer is up. Added HealthPickup.xml entity. Event PickupSpawned now gets published when a new HealthPickup spawns. Player now gains health as he picks up the HealthPickup.
2016-02-05 15:15:04 +01:00
e3a44d37d2
Merge branch 'master' into BoxModelCollision
...
# Conflicts:
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-05 14:59:14 +01:00
d61e605093
Can walk up "stair-steps". Cleanup WIP.
...
Better performance in RectanglevsTriangle check.
Added IsOnGround flag and VerticalStepHeight in Physics.
Lotsa commented code saved for historical reasons, remove later.
2016-02-05 10:56:34 +01:00
c526a7af55
WIP stencil stuff
2016-02-04 17:58:36 +01:00
6a23a987b3
Started PickupSpawnSystem, added 2 events and a system
2016-02-04 17:43:45 +01:00
7c582898f4
Working stencil buffer for the shield.
2016-02-04 14:33:39 +01:00
Jace
ff26e1235c
Merge pull request #77 from teamfisk/AMDCrashFix
...
AMD crash fix???????????
2016-02-04 12:05:05 +01:00
Jace
c87e4d4fd6
Added mutex to resource manager cache reading to avoid a potential race condition. We hope this is the actual bug we saw.
2016-02-04 11:53:11 +01:00
d4292d4b43
Merge pull request #63 from teamfisk/AssaultDash
...
Added AssaultDash
2016-02-04 11:50:00 +01:00
035c79564b
Changed Dash name to DashAbility. Fixed dash bug where you could do two different keys to dash.
2016-02-04 11:41:21 +01:00
379d211832
some fixes with the stencil states and implemented stencil func/stencilop/stencilmask to renderstate
2016-02-04 11:13:26 +01:00
03a16b46b5
Dash component now has the dash-maxCoolDownVariable in it.
2016-02-04 10:28:28 +01:00
bc01e147c2
Some state stuff, some draw stuff, some QA map stuff
2016-02-03 18:09:44 +01:00
1bd4aa91ff
Oops! Readded "Sprint" command. Removed some unnecessary variables in FirstPersonInputController. Fixed bug where you couldnt dash right away as the game started.
2016-02-03 17:45:37 +01:00
7b5a2a5388
Dashing now works great both with shift and doubletap. Added Dash Component. Changed default Player.xml to have a Dash Component. Disabled Sprint. You can now disable DoubleTapToDash in Input.Ini. Added command "SpecialAbility".
2016-02-03 17:30:46 +01:00
Jace
bd2da7bc9f
Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""
...
This reverts commit b56824786c
2016-02-03 16:30:00 +01:00
Jace
b56824786c
Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping"
...
This reverts commit 192de8078224aac6a00d
2016-02-03 16:16:06 +01:00
13161b4f57
Merge remote-tracking branch 'origin/master' into AssaultDash
2016-02-03 15:07:19 +01:00
7ffbd8455f
Added Queues for the models with shield and shielded components.
2016-02-03 13:53:57 +01:00
7bae2d0873
Added a ShieldComponent and a test area in QA map for defender shield
2016-02-03 11:58:06 +01:00
9d3171540d
AssaultDashCheck is now in FirstPersonInputController instead. TODO: config option, shift button, forward/backward dash
2016-02-03 11:54:14 +01:00
39653a1e4c
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
2016-02-03 10:38:21 +01:00
Jace
2cbeef4c69
Merge pull request #74 from teamfisk/Warnings-Jocke
...
Fixed warnings associated with Network
2016-02-03 10:37:10 +01:00
5e472cd69c
DeathExplosion is now an XML file, changed PlayerDeathSystem accordingly. The effect should show as soon as the explosioneffect-fix is merged into master. TODO: remove the test
2016-02-02 17:18:12 +01:00
55854f5c0d
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-02 16:30:57 +01:00
7236da09b4
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
2016-02-02 15:13:00 +01:00
45a92b362f
DoubleJumping now in InputController instead.
2016-02-02 15:10:11 +01:00
6a3f585fb9
Fixed warnings associated with Network.cpp, Client.cpp, Server.cpp and Packet.cpp.
...
BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT': macro redefinition was fixed by https://svn.boost.org/trac/boost/ticket/11539
2016-02-02 13:26:15 +01:00
William Moberg
Jace
Tleety
verysecrethero
Jocke