samcake
670826effc
appeasing linux gods ?
2016-05-12 14:50:41 -07:00
samcake
c6aeaf308b
appeasing linux gods ?
2016-05-12 14:36:45 -07:00
samcake
a436c54817
make scribe spit out bigger chunks of litteral strings
2016-05-12 14:14:05 -07:00
samcake
80c80091e4
Cleaning up code
2016-05-11 11:12:39 -07:00
samcake
99dcfef5a8
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-05-11 10:47:38 -07:00
samcake
1ec9ef560e
Fixing the srgb color format conversion for web entities
2016-05-11 10:46:54 -07:00
samcake
e40a795a27
Trying to clean up for pr
2016-05-10 19:25:22 -07:00
Brad Hefta-Gaub
757eea16a6
Merge pull request #7809 from howard-stearns/hand-controller-pointer
...
Hand controller pointer
2016-05-10 16:37:26 -07:00
Brad Hefta-Gaub
af6be7f5f3
Merge pull request #7845 from jherico/script_debug
...
Enable script debugging
2016-05-10 15:56:38 -07:00
Brad Davis
b117a4b8d7
Debugging menu destruction
2016-05-10 12:21:19 -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
samcake
303cade547
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-05-10 09:56:05 -07:00
Howard Stearns
64dc31cd61
switch statement whitespace
2016-05-10 09:43:00 -07:00
Howard Stearns
2b3f6506b7
more whitespace
2016-05-10 09:38:39 -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
samcake
00f2e34aa9
Changing emissive to unlit
2016-05-09 17:18:07 -07:00
samcake
615f4028c4
fixing the web enitites lighting, still need to solve the sRGB for it, starting to introduce the unlit feature to the overlays
2016-05-09 17:17:16 -07:00
Brad Davis
40316498a4
Enable script debugging
2016-05-09 17:02:40 -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
howard-stearns
9edd18c017
Fix mouse seek bugs.
2016-05-09 14:05:59 -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
samcake
37f16e9c86
Merging with master
2016-05-09 12:01:58 -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
howard-stearns
11ae685f04
Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer
2016-05-09 11:50:07 -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
howard-stearns
6f4204ca5b
Remove alert for route remapping on hardware change.
2016-05-09 11:41:00 -07:00
howard-stearns
af8d0dc280
Fix setReticlePosition and getReticlePosition to match.
2016-05-09 11:34:52 -07:00
