BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
954 Commits 116 Branches 0 Tags
becb197feb237fb034f3a4a8d1c670b176f09e49
Commit Graph

546 Commits

Author SHA1 Message Date
stiffly becb197feb Player walk is now based on distance traveled, and it is also reset when key is released. However when dashing the player step sound is still played. The distance of a step is also hard coded in the header file. Will config it up some day. 2016-02-05 17:46:27 +01:00
stiffly 454eef8225 WIP. Improving player walk logic. 2016-02-05 17:21:48 +01:00
stiffly fbdaf92953 Started refactoring. Put player walk logic in a designated sound system. 2016-02-05 16:39:23 +01:00
stiffly e90f802d48 Merge remote-tracking branch 'origin/master' into Sound 2016-02-05 13:59:21 +01:00
stiffly 71a86cab11 removed event that's not being used 2016-02-05 10:07:56 +01:00
stiffly d50caa1763 Gain events tested. works as intended 2016-02-04 16:14:50 +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
verysecrethero d4292d4b43 Merge pull request #63 from teamfisk/AssaultDash 
Added AssaultDash
 2016-02-04 11:50:00 +01:00
verysecrethero 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
stiffly 0a8ee1623f Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	assets
 2016-02-04 10:47:30 +01:00
verysecrethero 03a16b46b5 Dash component now has the dash-maxCoolDownVariable in it. 2016-02-04 10:28:28 +01:00
verysecrethero 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
verysecrethero 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
stiffly 2e3e59a1e2 Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	resources/Schema/Entities/Player.xml
 2016-02-03 16:52:33 +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 192de80782, reversing
changes made to 24aac6a00d.
 2016-02-03 16:16:06 +01:00
stiffly 938caa6ba2 Now uses OnComponentAttached event. Can now queue sound on a source. 2016-02-03 15:48:25 +01:00
verysecrethero 13161b4f57 Merge remote-tracking branch 'origin/master' into AssaultDash 2016-02-03 15:07:19 +01:00
verysecrethero 9d3171540d AssaultDashCheck is now in FirstPersonInputController instead. TODO: config option, shift button, forward/backward dash 2016-02-03 11:54:14 +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
stiffly a64d227cab Assured the volume channels were working. Playing around with drumloop 2016-02-03 10:17:53 +01:00
Tleety 55854f5c0d Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 2016-02-02 16:30:57 +01:00
verysecrethero 45a92b362f DoubleJumping now in InputController instead. 2016-02-02 15:10:11 +01:00
stiffly d763789490 Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	src/Engine/Sound/SoundSystem.cpp
 2016-02-02 13:38:49 +01:00
Jocke 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
stiffly cb0feb0b84 Tested hurt event. Randomizes between several different ones. 2016-02-02 13:25:25 +01:00
Tleety 7b4826cb44 Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 2016-02-02 13:24:31 +01:00
Jace 0e5f6da9a9 Merge pull request #73 from teamfisk/CapturePointFixBranch 
Several changes/fixes based on the latest broken refactoring in master
 2016-02-02 13:22:03 +01:00
verysecrethero 42b52a6766 Several changes/fixes based on the latest broken refactoring. 
Fixed Simon's mistake in CapturePointLogic. William fixed so TriggerSystem works again with CapturePoints.
 2016-02-02 11:37:22 +01:00
Tleety c708f1582c Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 2016-02-01 18:30:30 +01:00
Jace a3d4eb65d5 Fixes #66 warnings 2016-02-01 17:53:01 +01:00
stiffly 4ccda5ee43 WIP 2016-02-01 17:03:41 +01:00
Tleety 53cae25eb2 WIP on widget fuckery 2016-02-01 16:56:55 +01:00
Jace be3cfef65f Merge remote-tracking branch 'origin/master' into EditorUsefulness 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
 2016-02-01 16:00:46 +01:00
Jace 65f5bc673f Functional translation widget in global and local space 2016-02-01 15:47:56 +01:00
stiffly c5462b0363 Merge remote-tracking branch 'origin/master' into Sound 2016-02-01 14:35:47 +01:00
stiffly 25b3c02d29 Adding sounds for: jump, walk, shoot 2016-02-01 14:35:23 +01:00
Jace a22bc00d46 *cough* 2016-02-01 13:37:51 +01:00
Tleety 7054822be2 SceneLight component now working 2016-02-01 11:12:03 +01:00
Jace ee92200300 Improved editor pause logic. Editor now pauses when it's enabled and makes sure UI is up to date with the current state. 2016-02-01 10:45:37 +01:00
Tleety 8bcafc1151 WIP 2016-01-27 18:07:05 +01:00
Jace 65da634c71 File dropping into resource paths in the editor 2016-01-27 17:51:47 +01:00
Tleety 97cbc55223 Some debug features for color corrections and glow strength fix. 2016-01-27 17:21:00 +01:00
Jace 4b7613a659 Sorted editor component dropdown and made it always be fully expanded to show as many components as possible 2016-01-27 17:07:48 +01:00
Jace 7408da401b Merge pull request #56 from teamfisk/NormalSpecularMapping 
Transparency fix and support for Normal and Specular maps
 2016-01-27 16:44:10 +01:00
Jace 788407b709 Made CollisionSystem aware of entities 2016-01-27 15:42:50 +01:00
Tleety 0e70dc6fa3 Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 
# Conflicts:
#	include/Engine/Rendering/RenderSystem.h
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/RenderSystem.cpp
 2016-01-27 15:41:31 +01:00
Tleety 44302bb0f3 Specular support. Some edits to EditorTestWorld.xml aswell as some debugmodes for textures in the model component 2016-01-27 15:38:54 +01:00
Jace 181017313d Made entity parser give more useful errors and fixed the errors that were while I was at it 2016-01-27 15:16:59 +01:00