Anthony J. Thibault
652ce5501f
Expose Avatar default pose to JavaScript
...
New JavaScript API to get the avatar's default pose.
MyAvatar.getDefaultJointRotation(index);
MyAvatar.getDefaultJointTranslation(index);
See `examples/tPose.js` for example usage
2015-12-10 13:57:31 -08:00
Brad Hefta-Gaub
3d325351fb
Merge pull request #6602 from AndrewMeadows/character-cleanup
...
move raw bullet code from interface to physics lib
2015-12-10 07:26:29 -08:00
Howard Stearns
d964032572
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-09 15:23:00 -08:00
Howard Stearns
270cfe8af7
coding standards
2015-12-09 15:22:44 -08:00
Seth Alves
446ca8236f
disable physics disabler
2015-12-09 11:25:44 -08:00
Andrew Meadows
d59311f258
Merge pull request #6594 from sethalves/no-physics-until-ready
...
No physics until ready
2015-12-09 10:51:07 -08:00
Andrew Meadows
8c109fd623
move raw bullet code from interface to physics lib
2015-12-08 17:21:43 -08:00
howard-stearns
32e4967ee0
cleanup
2015-12-08 16:38:05 -08:00
howard-stearns
7afc803fb5
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-08 15:30:48 -08:00
howard-stearns
5b41d4da1c
Snapshot of "working" version.
2015-12-08 15:30:23 -08:00
Leonardo Murillo
9ba5670c76
Fix
2015-12-08 14:20:19 -08:00
Leonardo Murillo
dda99bfea6
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-12-08 14:07:50 -08:00
Seth Alves
c462bda86c
disable physics when moving to a new domain
2015-12-08 14:01:18 -08:00
Seth Alves
164439b303
don't enable physics until an entire scene has been received from the entity server and until nearby (to MyAvatar) entities are ready
2015-12-08 13:53:39 -08:00
Leonardo Murillo
9062cca8c4
Restoring
2015-12-08 13:33:15 -08:00
Seth Alves
dffa37c0e7
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-08 09:44:50 -08:00
Howard Stearns
faec4639b1
cap
2015-12-08 09:14:40 -08:00
Howard Stearns
481fe5a7d0
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 18:52:29 -08:00
samcake
d12fdb9726
Merge pull request #6584 from birarda/pref-no-auto
...
fix for avatar URL text editing, assert in Model.cpp
2015-12-07 18:11:49 -08:00
Brad Hefta-Gaub
4cbbd252d5
Merge pull request #6587 from jherico/rigel
...
Fix crashes on exit due to poor cleanup
2015-12-07 18:04:52 -08:00
Bradley Austin Davis
b7aeb34a8c
Fix crashes on exit due to poor cleanup
2015-12-07 17:50:08 -08:00
Seth Alves
742288c583
Merge pull request #6586 from Atlante45/master
...
Fix grab behavior
2015-12-07 17:47:47 -08:00
James B. Pollack
6cf1ad464f
Merge pull request #6583 from birarda/extension-ci
...
use a case insensitive check for extensions in Application
2015-12-07 17:33:03 -08:00
Atlante45
fc77d6cd40
Fix grab behavior
2015-12-07 17:08:36 -08:00
howard-stearns
9512c3f73d
Debugging.
...
Please enter the commit message for your changes. Lines starting
2015-12-07 16:58:59 -08:00
Stephen Birarda
4a0c6eebd8
change avatar URL when typing completed or accepted
2015-12-07 16:17:59 -08:00
howard-stearns
55cfd1c8b4
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 15:49:47 -08:00
howard-stearns
2974241796
typo
2015-12-07 15:49:29 -08:00
Stephen Birarda
7beaf5e235
force asset upload to use a lowercase extension
2015-12-07 15:18:32 -08:00
Stephen Birarda
0fee004bdd
use case insensitive check for extensions
2015-12-07 15:13:14 -08:00
Seth Alves
0bf276efa5
adjust method names to fit convention
2015-12-07 14:37:35 -08:00
Seth Alves
982e986f1a
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-07 14:31:18 -08:00
Seth Alves
f99812a903
adjust method names to fit convention
2015-12-07 14:31:08 -08:00
Leonardo Murillo
25494ec867
Merge pull request #6562 from Atlante45/baseball
...
Baseball
2015-12-07 14:11:21 -08:00
Clément Brisset
0be35ec6ea
Merge pull request #6578 from hyperlogic/tony/clear-joint-data-bug-fix
...
MyAvatar.clearJointData bug fix
2015-12-07 12:18:28 -08:00
Howard Stearns
289c8d6137
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 11:54:33 -08:00
Clément Brisset
42365acef5
Merge pull request #6561 from ZappoMan/cruftRemovalRedux
...
More Cruft Removal
2015-12-07 11:39:54 -08:00
Howard Stearns
17ecf9b6b7
debugging
2015-12-07 11:26:56 -08:00
Howard Stearns
8303b63491
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 10:11:12 -08:00
Howard Stearns
1d4cc7c984
Checkpoint exploring use of getLastSynchronizedElapsed and fixing paintWait (which may go away).
2015-12-07 10:01:46 -08:00
Clément Brisset
390836b64e
Merge pull request #6431 from huffman/proto-received-message
...
Combine Packet and PacketList into ReceivedMessage on receiving end
2015-12-07 09:58:52 -08:00
Ryan Huffman
dd6c8cbe33
Remove verbose piggyback logging
2015-12-07 09:42:04 -08:00
Anthony J. Thibault
fd4ed29405
MyAvatar.clearJointData bug fix
...
MyAvatar.setJointRotation() now works properly after MyAvatar.clearJointData()
2015-12-07 09:03:40 -08:00
Ryan Huffman
34138f07bd
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-07 08:58:47 -08:00
Atlante45
f8ee377f01
Fix QOpenGL warning
2015-12-07 08:37:07 -08:00
Seth Alves
60b8e65520
get file dialog working on Linux
2015-12-07 06:03:58 -08:00
Seth Alves
f6b1ef85b3
remap entity IDs on export also
2015-12-07 06:03:47 -08:00
Seth Alves
f53571ac81
remap IDs on export, also
2015-12-07 05:41:34 -08:00
Seth Alves
3cc423ca03
remap IDs when importing entities
2015-12-06 17:55:48 -08:00
Seth Alves
fff4e3e831
make SpatiallyNestable setters take values by reference
2015-12-06 12:01:30 -08:00