Seth Alves
de4c9530c9
carry clientOnly flag over from properties when addEntity is called
2016-05-10 14:48:12 -07:00
Seth Alves
f90b9ec65d
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-10 12:08:45 -07:00
Brad Hefta-Gaub
350743454b
Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1
...
use smart pointers for entity simulations
2016-05-10 11:35:57 -07:00
Brad Hefta-Gaub
963dda1b48
Merge pull request #7855 from hyperlogic/tony/updated-idle-animations
...
Updated default idle and turn animations.
2016-05-10 11:35:21 -07:00
Clément Brisset
c3ce463b6c
Merge pull request #7854 from zzmp/refactor/delayLoad
...
Clean up resource cache's encapsulation of asynchronous loading
2016-05-10 10:47:23 -07:00
Seth Alves
c572e1dc3a
delete avatar-associated entities when the avatar goes away
2016-05-10 10:30:49 -07:00
Seth Alves
4c1f815870
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-10 10:09:40 -07:00
Brad Hefta-Gaub
d7eee98acc
Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum
...
resurrection of threadsafe ViewFrustum
2016-05-10 09:06:38 -07:00
Seth Alves
b761ecf44f
merge from upstream
2016-05-10 08:18:45 -07:00
Brad Hefta-Gaub
466b535e4e
Merge pull request #7852 from ZappoMan/fixUpdateDialogFormatting
...
fix the update dialog to not show blank lines for missing version numbers
2016-05-10 08:18:38 -07:00
Brad Hefta-Gaub
573f6f3faa
Merge pull request #7843 from sethalves/fix-stanard-library-include-some-more
...
make Script.include(/~/system/libraries/utils.js) work from web again
2016-05-10 08:17:08 -07:00
Brad Hefta-Gaub
20b7e5f0a9
Merge pull request #7851 from Atlante45/remove-deadlock-status
...
Remove Deadlock status
2016-05-10 07:53:50 -07:00
Andrew Meadows
db9a4d6b8f
cleanup for code review
2016-05-10 07:49:11 -07:00
Brad Hefta-Gaub
6f84268593
Merge pull request #7850 from sethalves/nbody-example
...
Philip's gravity example
2016-05-10 07:48:25 -07:00
Anthony J. Thibault
0f1ff87f78
Updated default idle and turn animations.
...
* idle is less masculine and works better on prescilla & art3mis avatars.
* idle to walk transition is updated to work with this new idle.
* turn in place animations are improved.
* fly animation is more symmetric.
2016-05-09 18:43:30 -07:00
Seth Alves
68201746aa
Merge branch 'master' of github.com:highfidelity/hifi into fix-stanard-library-include-some-more
2016-05-09 18:39:37 -07:00
Zach Pomerantz
09d879e19f
Remove delayLoad
2016-05-09 18:09:48 -07:00
Zach Pomerantz
9ac783a88d
Black box asynch resource retrieval
2016-05-09 18:03:19 -07:00
Brad Hefta-Gaub
7bb21d3700
fix the update dialog to not show blank lines for missing version numbers
2016-05-09 16:19:03 -07:00
Brad Hefta-Gaub
0de721e8f4
Merge pull request #7838 from zzmp/refactor/script-sleep
...
Use sleep_until for ScriptEngine
2016-05-09 15:58:22 -07:00
Atlante45
5c196f3df5
Remove Deadlock status
2016-05-09 15:53:45 -07:00
Andrew Meadows
59c6a6dfea
Merge pull request #7825 from sethalves/linux-qol
...
Linux qol
2016-05-09 15:34:10 -07:00
Andrew Meadows
ffc3123467
Merge pull request #7658 from sethalves/grab-fixes
...
Grab fixes
2016-05-09 15:30:37 -07:00
Seth Alves
9fe827a93b
d'oh
2016-05-09 15:28:25 -07:00
Brad Hefta-Gaub
22081a8606
Merge pull request #7833 from zzmp/fix/scriptable-resource
...
Fix prefetching
2016-05-09 15:09:20 -07:00
Zach Pomerantz
7db082b915
Amend comment that was not a busy wait
2016-05-09 15:05:13 -07:00
Seth Alves
7ab52b8869
don't check fbx files into sourc
2016-05-09 14:58:26 -07:00
Seth Alves
ced7a56e39
Philip's gravity example
2016-05-09 14:43:24 -07:00
Brad Hefta-Gaub
2c0204b0d6
Merge pull request #7821 from Atlante45/fix/collision-sound
...
Fix avatar/entity collision sound
2016-05-09 14:24:19 -07:00
Brad Hefta-Gaub
343bc2a747
Merge pull request #7841 from jherico/mac_oculus
...
OSX Rift functionality
2016-05-09 13:12:46 -07:00
Brad Hefta-Gaub
312ea20e15
Merge pull request #7797 from zzmp/fix/cache-thread-safety
...
Make ResourceCache::resetResourceCounters threadsafe
2016-05-09 11:52:57 -07:00
Brad Hefta-Gaub
ab0a77c82b
Merge pull request #7830 from ZappoMan/removeusleeps
...
switch OctreeSendThread and OctreePersistThread to use std::this_thread::sleep_for() instead of usleep()
2016-05-09 11:47:40 -07:00
Brad Hefta-Gaub
39a4e38485
Merge pull request #7837 from samcake/hdr
...
Fixing the bad color format for skymaps
2016-05-09 11:47:02 -07:00
Chris Collins
91a5d82af5
Merge pull request #7826 from zzmp/perf/mipmap
...
Defer mipmap gen to gpu
2016-05-09 10:52:49 -07:00
Chris Collins
4f22e0ad5a
Merge pull request #7828 from sethalves/show-other-sim-owner
...
show with debug icons when someone else is the simulation owner
2016-05-09 10:49:30 -07:00
Brad Davis
335841bf0f
Fix plugin loading on OSX
2016-05-08 23:35:18 -07:00
Seth Alves
b0a5d8b719
make Script.include(/~/system/libraries/utils.js) work from web again
2016-05-08 08:45:58 -07:00
Bradley Austin Davis
0f768b13b9
Working on OSX Rift functionality
2016-05-07 20:17:31 -07:00
Seth Alves
0ab0409979
revert accidental change
2016-05-07 17:48:37 -07:00
Seth Alves
46c1049a35
bump protocol version
2016-05-07 17:48:06 -07:00
Seth Alves
91ff851bf8
fix call to queueEditEntityMessage
2016-05-07 16:59:54 -07:00
Seth Alves
473010f634
addEntity has a clientOnly flag now
2016-05-07 16:45:09 -07:00
Seth Alves
0e6d9a1eec
avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them.
2016-05-07 14:48:31 -07:00
Seth Alves
f8f86a0d45
only _exit if not DEBUG
2016-05-07 11:05:38 -07:00
Seth Alves
4b1274cb0f
Merge branch 'master' of github.com:highfidelity/hifi into linux-qol
2016-05-07 11:04:50 -07:00
Seth Alves
a0771f8ee5
use smart pointers for entity simulations
2016-05-07 09:14:33 -07:00
Zach Pomerantz
173d2a590c
Use sleep_until for ScriptEngine
2016-05-06 19:30:37 -07:00
samcake
da75c27188
fixing bad color format assignment code and bad color format for the cubemaps
2016-05-06 18:57:19 -07:00
Clément Brisset
b234d94d25
Merge pull request #7832 from birarda/session-location
...
repairs to user heartbeats
2016-05-06 15:15:52 -07:00
Zach Pomerantz
0fbbbaa985
Add tex loadPerfTest.js
2016-05-06 15:08:45 -07:00
