Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 17:20:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24051 commits 25 branches 0 tags 1.1 GiB
Commit graph

3175 commits

Author SHA1 Message Date
Clément Brisset
d6ee1c708d Merge pull request #4642 from ZappoMan/avatarUI 
New Avatar UI
 2015-04-15 19:13:23 +02:00
ZappoMan
ae16bab7c2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2015-04-14 13:13:15 -07:00
David Rowe
3b6a35c38f Merge branch 'master' into 20447 2015-04-13 17:22:34 -07:00
Thijs Wenker
cf403a7ad8 Merge branch 'master' of https://github.com/worklist/hifi into 20367 2015-04-09 23:47:20 +02:00
Thijs Wenker
0cb5ee5bd1 - Scripts JS object renamed to ScriptDiscoveryService. 
- Renamed Example script file for the ScriptDiscoveryService.
- Moved ScriptDiscoveryService functions to the RunningScriptWidget
 2015-04-09 23:46:49 +02:00
Brad Davis
9b34003e2d Merge pull request #4599 from Atlante45/fix_quit_vrmode_on_close 
Quit VRMode before aboutToQuit runs
 2015-04-07 17:06:29 -07:00
Brad Davis
c1a1157df9 Merge branch 'master' into menu 2015-04-07 14:41:17 -07:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1 
Introducing gpu::State and using it in the Model rendering path and more...
 2015-04-07 12:48:42 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -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
Thijs Wenker
a783f03025 New scripting functions Scripts.getPublic(), Scripts.getLocal() and Scripts.getRunning() functional. 2015-04-07 16:48:11 +02:00
Seth Alves
fb607e2b26 logging groups for library/shared and interface 2015-04-06 18:45:06 -07:00
Thijs Wenker
484b014fa7 Merge branch 'master' of https://github.com/worklist/hifi into 20367 2015-04-07 01:07:04 +02:00
Thijs Wenker
2b23108e61 ScriptsScripting Interface 2015-04-07 01:06:39 +02:00
David Rowe
ce104e8c40 Merge branch 'master' into 20447 2015-04-06 15:18:19 -07:00
Sam Gateau
ecdffadcb7 trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct 2015-04-06 10:17:31 -07:00
Sam Gateau
d6f74aa0ad Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-06 09:56:16 -07:00
Atlante45
a3f8076641 Quit VRMode before aboutToQuit runs 2015-04-06 17:55:48 +02:00
Sam Gateau
10269bd556 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-05 18:37:28 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
David Rowe
765d66eee5 Fix running without DDE available 2015-04-04 19:20:44 -07:00
David Rowe
1eb5716ab7 Shut down DDE when Interface shuts down 2015-04-04 19:04:47 -07:00
Seth Alves
e06dada756 Merge pull request #4592 from AndrewMeadows/thermonuclear 
profiling for physics simulation
 2015-04-04 15:00:44 -07:00
David Rowe
f6bf1d4141 Disable DDE code if not Windows or OSX 2015-04-03 17:41:19 -07:00
ZappoMan
0bc1b02895 improvements to tracking model names 2015-04-03 17:24:53 -07:00
ZappoMan
50479d5d5e set name to Default when using default url 2015-04-03 17:06:54 -07:00
ZappoMan
1a463a0256 more work on improved avatar UI adding model names and backward compatible support 2015-04-03 17:03:22 -07:00
ZappoMan
aaf191b6dc first cut at new avatar preferences UI 2015-04-03 14:31:43 -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
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
Bradley Austin Davis
8a757a4b6e Further work on menu handling on OSX in fullscreen / VR mode 2015-04-02 10:27:11 -07:00
Seth Alves
41ec2fdbe3 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-02 09:19:54 -07:00
Andrew Meadows
fc4e6e9355 merge upstream/master into andrew/bispinor 2015-04-02 09:04:15 -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
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
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
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