David Rowe
|
09b929b729
|
Restart looped animation running at shutdown when Interface starts
|
2015-04-07 14:02:24 -07:00 |
|
David Rowe
|
670d455b90
|
Fix manually entered attachment model URL not being used
|
2015-04-07 13:47:37 -07:00 |
|
David Rowe
|
ccf3afadfb
|
Fix manually entered joint mask value not being applied
|
2015-04-07 13:43:58 -07:00 |
|
David Rowe
|
082a9196ff
|
Fix manually entered animation URL not being able to be started
|
2015-04-07 13:43:04 -07:00 |
|
Seth Alves
|
ef5dffecf6
|
fix filenames in comments
|
2015-04-07 10:03:14 -07:00 |
|
Seth Alves
|
9014397167
|
try again without macro
|
2015-04-07 09:59:04 -07:00 |
|
Seth Alves
|
e63b39f061
|
oops missed one
|
2015-04-07 09:15:40 -07:00 |
|
Seth Alves
|
fc5b442e12
|
interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging
|
2015-04-07 09:15:11 -07:00 |
|
Seth Alves
|
fb607e2b26
|
logging groups for library/shared and interface
|
2015-04-06 18:45:06 -07:00 |
|
Sam Gateau
|
d6f74aa0ad
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2015-04-06 09:56:16 -07:00 |
|
Andrew Meadows
|
96a834183f
|
Merge pull request #4594 from jherico/oculus3
Enable Direct HMD mode only on windows
|
2015-04-06 09:24:53 -07:00 |
|
Clément Brisset
|
efbd74f539
|
Merge pull request #4597 from huffman/light-overlays
Light overlays
|
2015-04-06 16:02:44 +02:00 |
|
Seth Alves
|
e06dada756
|
Merge pull request #4592 from AndrewMeadows/thermonuclear
profiling for physics simulation
|
2015-04-04 15:00:44 -07:00 |
|
Bradley Austin Davis
|
f75ddb95f5
|
Enable Direct HMD mode only on windows
|
2015-04-03 17:01:21 -07:00 |
|
Ryan Huffman
|
ce2c23de51
|
Fix color not working for wire circle3d
|
2015-04-03 16:28:12 -07:00 |
|
Sam Gateau
|
423434af10
|
FInd one of the issue with shadows for avatars
|
2015-04-03 12:34:30 -07:00 |
|
Sam Gateau
|
7718680091
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2015-04-03 10:33:24 -07:00 |
|
Andrew Meadows
|
88ee1c313a
|
Merge pull request #4583 from huffman/fix-script-editor-icons
Update script editor to set icons programatically
|
2015-04-03 09:31:58 -07:00 |
|
Bradley Austin Davis
|
44c9d4a742
|
Working on removing some of the warnings in the xcode build
|
2015-04-02 16:12:44 -07:00 |
|
Andrew Meadows
|
2089a8c2dd
|
temporary debug setup: dump physics stats on F key
|
2015-04-02 15:33:06 -07:00 |
|
Andrew Meadows
|
eaef08abd5
|
add break to Key_Comma switch case
|
2015-04-02 15:25:55 -07:00 |
|
Sam Gateau
|
f96079f4f9
|
fixed the getViewFUrstum warning in DEBUG mode
|
2015-04-02 14:43:15 -07:00 |
|
Brad Davis
|
605cf19f6f
|
Merge pull request #4565 from ctrlaltdavid/20422
CR for #20422 - Add the ability to manage friends via Interface
|
2015-04-02 14:10:40 -07:00 |
|
Andrew Meadows
|
a824403132
|
Merge pull request #4582 from sethalves/island
Comma toggles rendering of collision hulls; more changes to vhacd stuff
|
2015-04-02 10:37:17 -07:00 |
|
Seth Alves
|
41ec2fdbe3
|
Merge branch 'master' of github.com:highfidelity/hifi into island
|
2015-04-02 09:19:54 -07:00 |
|
Ryan Huffman
|
df5a03b447
|
Update script editor to set icons programatically
|
2015-04-02 09:10:47 -07:00 |
|
Andrew Meadows
|
fc4e6e9355
|
merge upstream/master into andrew/bispinor
|
2015-04-02 09:04:15 -07:00 |
|
Andrew Meadows
|
f804b2311d
|
remove hover-friendly behavior
|
2015-04-02 08:40:47 -07:00 |
|
Clément Brisset
|
01dc1b058c
|
Merge pull request #4580 from birarda/master
use non-persistent settings to avoid lobby crash confusion
|
2015-04-02 17:37:24 +02:00 |
|
David Rowe
|
349cc3241d
|
Restore minimized windows to view
|
2015-04-01 18:59:34 -07:00 |
|
David Rowe
|
49de54de48
|
Use improved WebWindowClass for friends window
|
2015-04-01 18:58:59 -07:00 |
|
Seth Alves
|
abf83bcf9e
|
Merge branch 'master' of github.com:highfidelity/hifi into island
|
2015-04-01 18:26:26 -07:00 |
|
Seth Alves
|
79b1a6aeb0
|
comma key toggles rendering of collision hulls
|
2015-04-01 17:45:47 -07:00 |
|
Stephen Birarda
|
b27a86fb25
|
always render yourself, handle change of render values elsewhere
|
2015-04-01 17:36:43 -07:00 |
|
Andrew Meadows
|
b537625e59
|
Merge pull request #4574 from ZappoMan/crashOnExit
fix crash on shutdown related to entity scripts connecting to signals
|
2015-04-01 17:26:33 -07:00 |
|
Brad Hefta-Gaub
|
ad27d7353b
|
Merge pull request #4386 from jherico/oculus_old_renderer
DO NOT MERGE - Update Oculus SDK integration
|
2015-04-01 17:17:32 -07:00 |
|
Stephen Birarda
|
ee088e12f3
|
leverage scene scripting values to toggle rendering
|
2015-04-01 17:06:06 -07:00 |
|
Brad Hefta-Gaub
|
e5757575de
|
Merge pull request #4578 from samcake/orange
tweak the default specular value for the Primitive entities to less shiny
|
2015-04-01 16:36:53 -07:00 |
|
Bradley Austin Davis
|
58908f44ef
|
Fixing crash on exit when using (or used) VR mode
|
2015-04-01 16:05:46 -07:00 |
|
Sam Gateau
|
4a6046b07c
|
tweak the default specular value for the Primitive entities (sphere and cubes) so they do not shine so much
|
2015-04-01 15:50:04 -07:00 |
|
Bradley Austin Davis
|
fd47d4f3a5
|
Working on putting some more timing measurement into the code
|
2015-04-01 15:47:51 -07:00 |
|
Andrew Meadows
|
b37384d759
|
exit hover now not quite automatic when over floor
remove MyAvatar::jump() method for more general API
|
2015-04-01 15:13:27 -07:00 |
|
David Rowe
|
96e888864a
|
Merge branch 'master' into 20422
|
2015-04-01 14:56:48 -07:00 |
|
Stephen Birarda
|
526c9217a1
|
fix signup link from login dialog
|
2015-04-01 14:43:56 -07:00 |
|
Bradley Austin Davis
|
3b77118baa
|
Merge branch 'master' into oculus_old_renderer
|
2015-04-01 14:09:29 -07:00 |
|
Andrew Meadows
|
245729cba8
|
fix for avatar unable to jump into hover on mac
|
2015-04-01 13:47:40 -07:00 |
|
ZappoMan
|
aac824fb99
|
fix crash on shutdown
|
2015-04-01 13:47:25 -07:00 |
|
Bradley Austin Davis
|
a7dc1d26e6
|
Working on SDK vs client distortion performance differences
|
2015-04-01 13:23:55 -07:00 |
|
Sam Gateau
|
3b92910a91
|
Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters
|
2015-04-01 12:22:35 -07:00 |
|
David Rowe
|
e519928320
|
Move friends window to own class
|
2015-04-01 11:38:32 -07:00 |
|