 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
|
6990e473b3
|
Adding a clear here makes AMD drivers NOT crash for some reason. We're fixing the symptom but not the underlying cause.
|
2016-02-04 11:53:35 +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
|
c2833b10c4
|
Hard coded (read retarded) improvements added to player walk logic
|
2016-02-03 15:55:32 +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 |
|
|
verysecrethero
|
2391a0dbe9
|
Merge remote-tracking branch 'origin/master' into AssaultDash
|
2016-02-03 11:51:26 +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 |
|
|
Jace
|
192de80782
|
Merge pull request #75 from teamfisk/NormalSpecularMapping
Normal specular mapping
|
2016-02-03 10:34:22 +01:00 |
|
|
stiffly
|
a64d227cab
|
Assured the volume channels were working. Playing around with drumloop
|
2016-02-03 10:17:53 +01:00 |
|
 Tleety
|
51a588657e
|
QA map change
|
2016-02-03 10:11:53 +01:00 |
|
|
verysecrethero
|
73ab9bb4c6
|
Merge remote-tracking branch 'origin/master' into AssaultDash
# Conflicts:
# src/Game/Systems/PlayerMovementSystem.cpp
|
2016-02-03 09:52:54 +01:00 |
|
|
Tleety
|
73716c28e2
|
pickpass fix
|
2016-02-02 17:40:22 +01:00 |
|
|
Tleety
|
a3b7bd7df5
|
Fix in picking pass, QA map fix. Blue and red ray change. Player weapon change.
|
2016-02-02 17:39:57 +01:00 |
|
|
Tleety
|
11025b5466
|
QA-map stuff
|
2016-02-02 17:19:58 +01:00 |
|
|
Tleety
|
eba36b8492
|
Some QA-map fixes
|
2016-02-02 17:12:14 +01:00 |
|
|
Tleety
|
55854f5c0d
|
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
|
2016-02-02 16:30:57 +01:00 |
|
|
Tleety
|
12a181c1ff
|
Fixed a bug where normals scaled with model scale. Again.
|
2016-02-02 16:11:03 +01:00 |
|
|
Tleety
|
b131f56f5e
|
Made a quality assurance world that will need to be used before creating a pull request
|
2016-02-02 16:06:42 +01:00 |
|
|
Jace
|
24aac6a00d
|
Merge pull request #62 from teamfisk/DoubleJump
You can now DoubleJump!
|
2016-02-02 15:31:03 +01:00 |
|
|
verysecrethero
|
45a92b362f
|
DoubleJumping now in InputController instead.
|
2016-02-02 15:10:11 +01:00 |
|
|
stiffly
|
88ad127d8d
|
plays notification on captured/lost point
|
2016-02-02 14:57:03 +01:00 |
|
|
verysecrethero
|
2085d9ec9e
|
Merge remote-tracking branch 'origin/master' into DoubleJump
|
2016-02-02 14:22:00 +01:00 |
|
|
stiffly
|
83281fdaf1
|
Changed model in player.xml
|
2016-02-02 13:39: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 |
|
|
Tleety
|
28d412f5c7
|
Some small changes to test world and assets
|
2016-02-02 13:24:18 +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
|
9c2e459e0c
|
Deatheffect color now correctly calculated
|
2016-02-02 10:58:00 +01:00 |
|
|
Tleety
|
8299b99e2f
|
Test world changes and some other small fixes
|
2016-02-01 19:08:46 +01:00 |
|
|
Tleety
|
c708f1582c
|
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
|
2016-02-01 18:30:30 +01:00 |
|
|
Tleety
|
782c1a388a
|
Comment
|
2016-02-01 18:23:40 +01:00 |
|
|
Tleety
|
a188a3f7fa
|
Removed widget pointlight since it is now redundant
|
2016-02-01 18:22:36 +01:00 |
|
|
Tleety
|
ed7d00c1d8
|
Bug where widgets did not get their ambient light now fixed.
|
2016-02-01 18:19:38 +01:00 |
|