Babiuch, Ryan Nicholas
fb5236e9b2
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-04 16:50:43 -06:00
Babiuch, Ryan Nicholas
0069849da3
Consider existing velocity in calculating energy costs when editing entities.
2016-02-04 08:55:23 -06:00
Babiuch, Ryan Nicholas
dca7ff967c
Conform to coding standard.
2016-02-04 08:26:56 -06:00
Babiuch, Ryan Nicholas
142ec76600
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-04 08:18:47 -06:00
Stephen Birarda
816fe52c5b
mark getAvatarBySessionID as virtual
2016-02-03 17:31:38 -08:00
Stephen Birarda
058bba7b55
move avatar invokables from AvatarManager to AvatarHashMap
2016-02-03 17:13:35 -08:00
Andrew Meadows
63df34541d
Merge pull request #6802 from huffman/agent-simulation
...
Fix Agents bidding on simulation ownership
2016-02-03 13:45:12 -08:00
Babiuch, Ryan Nicholas
786400eb53
Merge branch 'WorkingEnergy'
2016-02-03 14:53:28 -06:00
Babiuch, Ryan Nicholas
d7951f4300
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-03 14:52:08 -06:00
Andrew Meadows
861082964e
Merge pull request #7017 from hyperlogic/tony/fly
...
MyAvatar: Improved Jump / InAir / Fly behavior
2016-02-03 12:22:30 -08:00
Brad Hefta-Gaub
839ce50bde
Merge pull request #7018 from jherico/qml
...
QML fixes
2016-02-03 11:59:27 -08:00
Babiuch, Ryan Nicholas
3d727d76c2
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-03 13:39:13 -06:00
Babiuch, Ryan Nicholas
3cb2f9c4b7
Exposed energy cost multiplier to scripting.
...
- field: costMultiplier
2016-02-03 13:29:42 -06:00
Stephen Birarda
93530fca72
fix the last of the current override warnings for OS X
2016-02-03 11:08:41 -08:00
Anthony J. Thibault
fff603e4e2
Removed comment
2016-02-03 10:21:27 -08:00
Ryan Huffman
963c71a476
Fix ES rejecting unowned entity physics updates
2016-02-03 09:28:49 -08:00
Babiuch, Ryan Nicholas
7dd5bca17f
Bug fixes and debt reductions on energy calculations.
...
- removed superfluous code interfacing with scripts
- favor floats over doubles in cost calculations
- default avatar energy is maximum float value for cases where energy script is not loaded in order to still manipulate entities.
2016-02-03 10:46:28 -06:00
samcake
4d62df2996
Merge pull request #7011 from zzmp/fix/render-connect-warnings
...
Only connect render config if dirty signal present
2016-02-02 17:46:22 -08:00
samcake
940ef40b69
Merge pull request #6999 from zzmp/refactor/render-init-file
...
Migrate stencil and overlay jobs to use plumbers
2016-02-02 17:45:17 -08:00
Zach Pomerantz
aa10af2851
Revert "Move DrawStencil to use ShapePlumber"
...
This reverts commit 671f27e5bc
2016-02-02 17:10:21 -08:00
Bradley Austin Davis
f24f2749e1
Make users.js show QML window for edit friends
2016-02-02 15:19:12 -08:00
Anthony J. Thibault
6cc3b2b47f
Fixed unused variable warnings on OSX and Linux
2016-02-02 15:04:28 -08:00
Brad Hefta-Gaub
a025fab5c8
Merge pull request #7016 from jherico/qml
...
QML Fixes
2016-02-02 14:08:45 -08:00
Ryan Huffman
759b1a347c
Merge pull request #7015 from birarda/audio-mute-crash
...
rename canAdjustLocks to isAllowedEditor, add debug for crash
2016-02-02 13:12:06 -08:00
Ryan Huffman
25632b63b7
Adjust Entities.addEntity to not bid on simulation from AC Script
2016-02-02 13:00:35 -08:00
Anthony J. Thibault
656608e2ff
Fixes for away.js
2016-02-02 12:08:52 -08:00
Bradley Austin Davis
2c26b32341
Make QML based tool-windows close properly
2016-02-02 12:00:58 -08:00
Anthony J. Thibault
c4e1509aa2
CharacterController: better debug support of internal state machine
...
Head is no longer visible when flying fast, in first-person HMD mode.
2016-02-02 11:26:18 -08:00
Anthony J. Thibault
8b5cf3e49a
CharacterController: refined state machine.
2016-02-02 11:26:17 -08:00
Anthony J. Thibault
47f3ce3786
CharacterController jump is more reliable.
2016-02-02 11:26:16 -08:00
Anthony J. Thibault
2936811484
Added takeoff animation, WIP
...
Character controller still has some jump/in-air bugs.
2016-02-02 11:26:15 -08:00
Anthony J. Thibault
61c55ebf6c
Updated character controller with a state enumeration
...
Also, adjusted checkForSupport logic such that very slanted walls are not considered support.
2016-02-02 11:26:15 -08:00
Anthony J. Thibault
e9fd439ffd
Added inAir animations
2016-02-02 11:23:46 -08:00
Ryan Huffman
eff02d3e3a
Fix Agents bidding on simulation ownership
2016-02-02 10:47:51 -08:00
Bradley Austin Davis
aecf582593
Don't crash on GL error in present thread
2016-02-01 18:26:32 -08:00
Zach Pomerantz
0b6cfbe50a
Only connect render config if dirty signal present
2016-02-01 17:48:31 -08:00
Stephen Birarda
095f0b9349
rename canAdjustLocks to isAllowedEditor for multi-purpose
2016-02-01 16:46:11 -08:00
samcake
1b52d700a0
Merge pull request #6871 from Atlante45/feat/draw-call-info
...
Unify normal and named draw paths
2016-02-01 14:19:15 -08:00
Brad Hefta-Gaub
711787a997
Merge pull request #6981 from howard-stearns/animate-iff-visible-with-step2-billboard-removal
...
Animate iff visible with step2 billboard removal
2016-02-01 13:54:25 -08:00
Atlante45
ad215f23c6
Deactivate SSBOs for now
2016-02-01 22:41:01 +01:00
James B. Pollack
8e75ce8232
Merge pull request #6967 from zzmp/fix/render-count
...
Render the correct maxDrawnItems
2016-02-01 13:34:33 -08:00
Zach Pomerantz
5d49eacf83
Move pipeline init to separate file
2016-02-01 11:12:11 -08:00
Anthony Thibault
b345df8002
Merge pull request #6987 from AndrewMeadows/better-ik
...
reduce hand-IK coupling to hip offset
2016-02-01 10:36:21 -08:00
Zach Pomerantz
df894d364a
Move DrawOverlay3D to use ShapePlumber
2016-02-01 10:30:14 -08:00
Zach Pomerantz
671f27e5bc
Move DrawStencil to use ShapePlumber
2016-02-01 10:30:08 -08:00
Atlante45
5ac0350993
Don't fall through in switch case
2016-02-01 18:50:01 +01:00
Andrew Meadows
71664dffae
change string comparisons to be CaseSensitive
2016-02-01 09:50:01 -08:00
Atlante45
52885545ea
Use feature name for ifdef
2016-02-01 18:50:01 +01:00
Atlante45
838b637591
Don't capture raw draw calls during named calls processing
2016-02-01 18:50:01 +01:00
Atlante45
a5603140de
Fix for mac
2016-02-01 18:50:01 +01:00
