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
Seth Alves
a948ae5f19
children of avatar joints might be right, now
2015-12-06 10:48:00 -08:00
Seth Alves
9a80c4d681
call locationChanged on children of joints when joints change
2015-12-06 05:43:23 -08:00
Clément Brisset
2ace061893
Merge pull request #6564 from sethalves/fix-line-overlays
...
fix 3d line overlays
2015-12-04 17:38:15 -08:00
Seth Alves
7448d9f262
Merge pull request #6565 from hyperlogic/tony/thread-safe-rig-joint-getters
...
Make Avatar::getJointRotation and getJointTranslation thread-safe
2015-12-04 16:45:56 -08:00
Anthony J. Thibault
7abfc93ff9
Avatar::getJointRotation and getJointTranslation is thread-safe
...
It can be called from script with minimal blocking,
because it inspects a copy of the joint values from the Rig, which is updated atomically.
This copy occurs in Rig::updateAnimations()
2015-12-04 16:16:17 -08:00
Howard Stearns
fa0ad1fe4d
Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate
2015-12-04 16:12:22 -08:00
Seth Alves
817f0307a0
fix 3d line overlays
2015-12-04 15:51:19 -08:00
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
howard-stearns
0a9b42ad3c
Fix present rate stats display, which was counting (roughly) twice for 2D
...
display, and flickering.
2015-12-04 15:10:46 -08:00
Brad Hefta-Gaub
2a243ccd17
Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemovalRedux
2015-12-04 14:58:38 -08:00
Brad Hefta-Gaub
46946212cf
remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true
2015-12-04 14:24:31 -08:00
Brad Hefta-Gaub
f44a9daa21
remove WANT_DELTA from OctreeQuery
2015-12-04 14:04:57 -08:00
Brad Hefta-Gaub
f71d2d00d2
Merge pull request #6548 from jherico/threaded_present
...
Threaded present
2015-12-04 13:42:09 -08:00
Brad Davis
11917ca501
Fixing preview / vsync functionality
2015-12-04 12:46:19 -08:00
Ryan Huffman
89c412c324
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-04 11:38:28 -08:00
Anthony Thibault
3118634df0
Merge pull request #6547 from howard-stearns/fix-anim-graph-preference-change
...
Fix anim graph preference change
2015-12-04 11:25:50 -08:00
Brad Hefta-Gaub
0ad4efeeb9
Merge pull request #6555 from howard-stearns/remove-unimplemented-collision-shapes-menu-item
...
Remove unimplemented collision menu items
2015-12-04 11:25:08 -08:00
Brad Hefta-Gaub
d07629489c
Merge pull request #6543 from Atlante45/pointer
...
gpu::Shader::create* return shared_ptr
2015-12-04 11:17:02 -08:00
Howard Stearns
a0a4f7d177
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-anim-graph-preference-change
2015-12-04 11:08:44 -08:00
Howard Stearns
cb67f05103
Remove unimplemented menu items Developer->Avatar->Show Skeleton/Head Collision Shapes.
2015-12-04 10:47:27 -08:00
Brad Davis
90ef7c6bf7
Disabling 0.5 Oculus plugin (Mac / Linux) for now
2015-12-04 10:28:20 -08:00
Brad Davis
c4514743d1
Fixing tests, moving some plugin container stuff to base class
2015-12-04 10:28:19 -08:00
Brad Davis
60aa93c38c
Fixing menu items in display plugins
2015-12-04 10:28:19 -08:00
Brad Davis
d8bb9f8d18
Fixing screenshot functionality
2015-12-04 10:28:17 -08:00
Brad Davis
b9ace94ff1
Prototyping threaded present
2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
49a7852d76
Merge pull request #6540 from Atlante45/warnings
...
Fix warnings on OS X
2015-12-04 10:19:25 -08:00
Brad Hefta-Gaub
8b58aa706a
Merge pull request #6534 from jherico/homer
...
Windows 64 bit updates
2015-12-04 10:05:45 -08:00
Atlante45
a455cb880f
Fix typeid warning
2015-12-04 09:23:16 -08:00
Brad Hefta-Gaub
f472b515c3
remove wantsColor support since its always true and required for entities
2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub
81fb4476bc
remove coverage map and occulusion culling, since it was always disabled
2015-12-03 20:29:23 -08:00
Brad Hefta-Gaub
5a75a17174
Revert "Cruft removal"
2015-12-03 17:40:41 -08:00
Howard Stearns
d51785a259
Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate
2015-12-03 17:28:32 -08:00
Clément Brisset
fa52b97f61
Merge pull request #6538 from ZappoMan/cruftRemoval
...
Cruft removal
2015-12-03 17:03:04 -08:00
Andrew Meadows
9c54ee2eaf
Merge pull request #6525 from howard-stearns/user-settable-avatar-lod-preference
...
Add an avatar LOD preference called "Minimum Avatar Display Distance"
2015-12-03 17:01:41 -08:00
Howard Stearns
187c213f41
reset skeleton
2015-12-03 16:42:57 -08:00
Brad Hefta-Gaub
1df24dd174
Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemoval
2015-12-03 16:31:15 -08:00
howard-stearns
1b42c5a172
Make MyAvatar.get/setAnimGraphUrl take a url(!), and make setting it
...
actually do something.
2015-12-03 16:16:01 -08:00
Atlante45
3da80f5861
gpu::Shader::create* return shared_ptr
2015-12-03 14:56:07 -08:00
Howard Stearns
4a8649c202
Change get/setRenderDistanceLow/HighLimit and avatarRenderDistanceHighLimit to get/setRenderDistanceInverseLow/HighLimit and avatarRenderDistanceInverseHighLimit.
2015-12-03 14:23:16 -08:00
samcake
902b6b8ea1
Merge pull request #6506 from jherico/maggie
...
OpenGL class cleanup
2015-12-03 13:55:29 -08:00
Brad Hefta-Gaub
1a5bc5d111
removing optional compression
2015-12-03 12:40:24 -08:00
Howard Stearns
375211e13b
Use isVSynchronized in controller.
2015-12-03 11:29:13 -08:00
Brad Hefta-Gaub
849a8707d2
remove wantsColor support since its always true and required for entities
2015-12-03 11:11:15 -08:00
Seth Alves
4e74c98ae7
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-03 11:00:13 -08:00
Brad Davis
2cea593fbd
Remove RealSense & MIDI
2015-12-03 11:00:01 -08:00
Brad Hefta-Gaub
0c05ffe9ce
remove coverage map and occulusion culling, since it was always disabled
2015-12-03 10:20:04 -08:00
Ryan Huffman
ce882a9c11
Replace QSharedPointer ctor with ::create
2015-12-03 09:43:36 -08:00
Brad Hefta-Gaub
c0bd54e8a2
change hydra secondary thumb to 0 button
2015-12-03 09:06:18 -08:00
Brad Hefta-Gaub
b122586ea5
remove camera cycle and context menu from standard mapping
2015-12-03 08:08:04 -08:00
Howard Stearns
53bfcd17e2
Use plugins data for Application frame rate/period.
2015-12-02 16:41:16 -08:00
Seth Alves
6eae98fb28
merge from upstream
2015-12-02 14:38:26 -08:00
Anthony Thibault
e0ca1c0f4c
Merge pull request #6496 from PhilipRosedale/master
...
Improved audio-driven mouth shapes
2015-12-02 14:20:20 -08:00
Howard Stearns
861393910a
Add an avatar LOD preference called "Minimum Avatar Display Distance"
2015-12-02 12:12:57 -08:00
Howard Stearns
38182bfd9d
Merge pull request #6523 from hyperlogic/tony/avatar-reset-improvements
...
MyAvatar::reset() improvements
2015-12-02 11:40:46 -08:00
Seth Alves
f18fc84c2d
fix debug build
2015-12-02 10:46:10 -08:00
Anthony J. Thibault
0b05a341a8
MyAvatar::reset() improvements
...
Body should not orient under the HMD body without changing the HMD view point.
It's more predictable and less likely to make you sick.
It also should reset the height of the character to cancel out squatting, if the HMD position is low.
2015-12-02 10:18:02 -08:00
Seth Alves
0595ef0938
merge from upstream
2015-12-02 09:30:19 -08:00
Leonardo Murillo
f5dfc7d3e4
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-12-02 10:42:57 -06:00
Philip Rosedale
be2f14cae5
Review fix
2015-12-01 21:50:01 -08:00
Anthony J. Thibault
99065f10fa
Avatar Warning fixes on linux
2015-12-01 18:12:01 -08:00
James B. Pollack
52d6fdac1a
Merge pull request #6487 from ctrlaltdavid/20740
...
Get the Leap Motion working again
2015-12-01 15:40:48 -08:00
Atlante45
c4e43c4e0b
Merge branch 'baseball-test' of github.com:Atlante45/hifi into baseball
2015-12-01 15:16:05 -08:00
Atlante45
f06b5b05b3
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-01 15:14:58 -08:00
Howard Stearns
455927204e
Merge pull request #6511 from hyperlogic/tony/avatar-sim-rate-display-fix
...
Avatar Sim Rate Display fix
2015-12-01 12:09:07 -08:00
Seth Alves
b8d800f5b8
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-01 11:59:10 -08:00
Atlante45
70dd8ec19a
Remove left/right relative pos/rot from c++
2015-12-01 11:44:42 -08:00
Seth Alves
7f95e1eec6
make sure observed held objects are active in bullet, disable equip spring action
2015-12-01 10:49:07 -08:00
Anthony J. Thibault
71f1be2b38
Avatar Sim Rate Display fix
...
Division by zero on first update was causing the displayed
avatar simulation rate to be incorrect.
2015-12-01 10:46:04 -08:00
Leonardo Murillo
418b9c8fea
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-12-01 11:57:38 -06:00
Seth Alves
11f18c3ada
also make sure the holder doesn't end up with a static-in-bullet held object
2015-12-01 09:52:51 -08:00
Brad Davis
0023c034c4
Fixing naming of GL classes
2015-11-30 18:27:03 -08:00
Atlante45
083205916f
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-30 18:25:53 -08:00
Atlante45
8d9eeb3897
Have separate left/right hold action offset
2015-11-30 18:04:34 -08:00
Atlante45
3bbd20a7bd
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball-test
2015-11-30 18:02:34 -08:00
Brad Davis
a94b6667b1
Moving most of GLCanvas to gl library
2015-11-30 17:19:42 -08:00
Seth Alves
b7ebe5b92b
merge from upstream
2015-11-30 16:59:52 -08:00
Howard Stearns
6f50d91208
Merge pull request #6461 from hyperlogic/tony/remove-joint-states
...
Refactor of Rig and MyAvatar animation JavaScript interface
2015-11-30 16:28:15 -08:00
Anthony J. Thibault
31cecdc174
Menu: removed Enable Avatar Threading option.
...
To re-enable, you can set ENABLE_AVATAR_UPDATE_THREADING to true on line 2552 of Application.cpp.
Also, removed other unused strings.
2015-11-30 15:45:23 -08:00
Clément Brisset
e168966b87
Merge pull request #6409 from birarda/injector-hybrid
...
more efficient threading of networked AudioInjector objects
2015-11-30 15:36:41 -08:00
Anthony J. Thibault
f922f61c3d
AvatarUpdate: fix for very large dt
...
This was affecting threaded avatar update when enabled.
2015-11-30 15:21:04 -08:00
Seth Alves
02c4730388
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-30 14:09:31 -08:00
Seth Alves
5c327edd5a
keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts
2015-11-30 14:08:07 -08:00
Seth Alves
89b78986d5
remove some more stray const
2015-11-30 14:01:17 -08:00
Stephen Birarda
4573e5c59e
resolve conflicts on merge with upstream/master
2015-11-30 13:32:38 -08:00
Anthony J. Thibault
11bfed4185
Merge branch 'master' into tony/remove-joint-states
2015-11-30 11:21:44 -08:00
James B. Pollack
85b8266537
Merge pull request #6494 from ctrlaltdavid/20744
...
Fix menu shortcuts created in JavaScript not working
2015-11-30 11:20:10 -08:00
Ryan Huffman
1b0413f8e3
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-30 10:23:40 -08:00
Ryan Huffman
99dd9646bc
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-30 10:20:13 -08:00
Seth Alves
081174fe69
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-30 10:18:01 -08:00
Andrew Meadows
49a6f63663
remove whitespace and fix warning (unused var)
2015-11-30 10:00:05 -08:00
Seth Alves
ded8a624ad
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-30 09:41:28 -08:00
Philip Rosedale
2377875623
Tabs to spaces v2
2015-11-30 08:05:25 -08:00
Philip Rosedale
ba379e8830
Tabs to spaces
2015-11-30 08:00:12 -08:00
Leonardo Murillo
6a53140720
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-30 08:38:13 -06:00
David Rowe
ce100dbbc5
Fix crash in WebWindowClass in debug build setTitle on open WebWindow
2015-11-30 15:10:51 +13:00
Seth Alves
cf39cac7fc
attempt to make SpatiallyNestable data access thread-safe
2015-11-29 12:50:33 -08:00
David Rowe
866037ec7c
Fix menu shortcut keys set by JavaScript not working
2015-11-30 08:33:38 +13:00
Seth Alves
e91a8684a4
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-29 10:17:36 -08:00
Anthony Thibault
a9e25c51e5
Fix for linker warning LNK4075 on Windows
...
Specifcally, this warning:
LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification
The fix is to set /OPT:NOREF and /OPT:NOICF on debug builds.
2015-11-27 20:56:57 -08:00
Leonardo Murillo
6ab8821725
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-27 14:04:42 -06:00
Leonardo Murillo
766f0dbd32
Have stack manager use bundled stack
2015-11-27 14:04:33 -06:00
Seth Alves
ca75802b9c
unmangle merge
2015-11-26 06:43:28 -08:00
Seth Alves
7df984e7b2
fix deadlock when setting parentID to null
2015-11-26 05:30:01 -08:00
Philip Rosedale
eccca218f0
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-25 20:47:01 -08:00
Philip Rosedale
a40ead077f
Mouth animation improvements
2015-11-25 20:37:51 -08:00
Anthony J. Thibault
549a8f7130
Fix for avatars with no eyes
...
For example:
https://hifi-public.s3.amazonaws.com/ozan/avatars/hifi_team/howard/howard.fst
https://hifi-public.s3.amazonaws.com/ozan/avatars/hifi_team/tony/tony.fst
2015-11-25 17:24:55 -08:00
Anthony J. Thibault
7c9cb97783
Merge branch 'master' into tony/remove-joint-states
2015-11-25 15:48:51 -08:00
