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

2059 commits

Author SHA1 Message Date
Andrzej Kapolka
eceb600de7 More work on PrioVR integration. 2014-05-13 14:44:24 -07:00
Andrzej Kapolka
f2ba2a48f2 Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-13 11:38:51 -07:00
Kai Ludwig
90d577a48c Stats area is now always right of mirror display, regardless if mirror display is enabled or not as there is always a remaining audio meter. 
Display, resize and click cases have been adapted by removing the condition for checking display status of mirror.
 2014-05-13 00:37:36 +02:00
Andrzej Kapolka
e0486b2654 Starting on PrioVR integration. 2014-05-12 15:25:25 -07:00
Stojce Slavkovski
ac8d27ee3a Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-11 09:53:22 +02:00
Philip Rosedale
6a5affba3d Merge pull request #2826 from ey6es/master 
Fix for scripts' not correctly removing/reattaching on restart, don't render head attachments in first person mode.
 2014-05-09 15:32:50 -07:00
Philip Rosedale
e1717b1c53 Fix bug with mirror settings not initialized 2014-05-09 15:02:47 -07:00
Andrzej Kapolka
b9fecb8b92 Wait for scripts to finish before restarting them. 2014-05-09 14:34:13 -07:00
Stojce Slavkovski
863a8887d3 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-08 20:29:26 +02:00
Stojce Slavkovski
a1c31522ba Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-08 20:09:36 +02:00
Philip Rosedale
2797d0ab3b removed hand trying to follow mouse and other cruft 2014-05-08 00:09:07 -07:00
Philip Rosedale
538e785208 Merge pull request #2815 from ZappoMan/modelserver 
More Model Improvements & some other tweaks
 2014-05-07 20:59:04 -07:00
Philip Rosedale
e6a8c79f9f Added more arrow controls to move camera when in mirror mode, new guitar chords. 2014-05-07 16:51:22 -07:00
ZappoMan
37ca6efc7c correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't 2014-05-07 11:48:32 -07:00
Philip Rosedale
fc962749c0 Arrow keys adjust distance from camera in mirror mode, air guitar script 2014-05-06 22:41:08 -07:00
Stojce Slavkovski
490ec23d8c Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-07 07:38:48 +02:00
Stojce Slavkovski
8ee282e7d2 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-06 22:01:48 +02:00
Andrzej Kapolka
9421af9f10 Fix for attachments' not appearing in rear view mirror head mode. 2014-05-06 11:14:48 -07:00
Andrzej Kapolka
2a32700a30 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 17:03:31 -07:00
Stojce Slavkovski
7f96f81c24 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-05 00:55:37 +02:00
Andrzej Kapolka
e0400dbd9c Working on allowing attachment models to be uploaded. 2014-05-04 15:23:31 -07:00
Andrzej Kapolka
2bc605e193 Merge pull request #2779 from PhilipRosedale/master 
Remove dead ‘play slaps’ code
 2014-05-04 13:33:03 -07:00
Stojce Slavkovski
d93480458f Posting Image to forum 2014-05-04 18:30:58 +02:00
Stojce Slavkovski
cec3ce78b9 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-03 21:12:39 +02:00
Philip Rosedale
ab0e854336 Removed session UUID from interface title bar 2014-05-03 11:33:39 -07:00
Stojce Slavkovski
b2c1afe1bd Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-03 09:52:19 +02:00
Andrzej Kapolka
93cb5fc330 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-02 17:21:51 -07:00
Philip Rosedale
9aac74035c Merge pull request #2771 from birarda/oauth-ds 
restrict access to domains using user roles retreived from data-web
 2014-05-02 17:09:52 -07:00
Andrzej Kapolka
6f3b3acc86 Remove pushback entirely for other avatars. 2014-05-02 16:27:39 -07:00
Stephen Birarda
53eddab43c fix typo for OAuth header include 2014-05-02 15:52:50 -07:00
Andrzej Kapolka
f3948d5e62 If "collide with avatars" is off, don't attempt camera pushback. 2014-05-02 15:02:40 -07:00
Stephen Birarda
aa2931d9bb resolve conflicts on merge with upstream/master 2014-05-02 10:39:17 -07:00
Stephen Birarda
4936fb3857 expose access token from AccountManager 2014-05-02 10:34:29 -07:00
Stojce Slavkovski
852756e84d Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-02 19:03:11 +02:00
AndrewMeadows
ac549977be Merge pull request #2770 from ZappoMan/modelserver 
Fix a couple bugs in Models
 2014-05-02 10:01:44 -07:00
ZappoMan
b8eb441468 removed debugging 2014-05-02 09:31:28 -07:00
ZappoMan
715e6b8e60 debugging model editing 2014-05-02 09:10:30 -07:00
Philip Rosedale
69f0611a06 Correction to actually pick closest 2014-05-02 09:05:09 -07:00
Philip Rosedale
03b59055fd merge conflict fix 2014-05-02 07:10:43 -07:00
Philip Rosedale
4089d54389 Avatar makes eye contact with the person nearest to gaze direction 2014-05-02 00:21:14 -07:00
AndrewMeadows
05e5277084 Merge pull request #2764 from ZappoMan/modelserver 
Model Server, Renderer, Scripting, etc
 2014-05-01 15:39:12 -07:00
Stephen Birarda
d942054015 cleanup re-display of OAuthWebView 2014-05-01 12:44:42 -07:00
Thijs Wenker
df6df759a3 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-05-01 21:08:20 +02:00
Thijs Wenker
9667748156 - Style fixes 
- ScriptHightlighting qouting RegEx fix (  "hello" + " " + "world" // the text between two quote entities isn't red anymore )
 2014-05-01 21:07:46 +02:00
Stephen Birarda
7d3157b1a0 trust high fidelity root CA cert for OAuth redirect 2014-05-01 11:54:51 -07:00
AndrewMeadows
2ad31793e2 Merge pull request #2756 from PhilipRosedale/master 
Added back ability to see/debug head/gaze position with ‘Head Mouse'
 2014-05-01 11:51:58 -07:00
Stephen Birarda
56c24ce8b7 present QWebView for OAuth authorization in interface 2014-05-01 11:09:35 -07:00
Thijs Wenker
a33c18c15d Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-05-01 14:49:50 +02:00
Philip Rosedale
223d9cf32e Added back ability to see/debug head and eye gaze position with ‘Head Mouse’ 2014-04-30 21:29:50 -07:00
Ryan Huffman
9e684a0bc8 Add registerGetterSetter to remove need for getEngine() 2014-04-30 11:17:36 -07:00
ZappoMan
0182a6d895 models working end to end 2014-04-30 11:12:49 -07:00
Thijs Wenker
7125b6ab8e Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 
Conflicts:
	interface/src/Application.cpp
 2014-04-30 20:08:11 +02:00
Ryan Huffman
65fd2a7724 Merge remote-tracking branch 'upstream/master' into 19612 
Conflicts:
	interface/src/Menu.cpp
 2014-04-30 09:57:17 -07:00
Ryan Huffman
0570849df5 Add Window and location to global script object 2014-04-30 09:38:57 -07:00
ZappoMan
58c852d210 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-04-30 09:29:06 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07:00
Ryan Huffman
8ee90715bd Revert changes to call to saveSettings in Application 2014-04-29 17:20:15 -07:00
Ryan Huffman
fa9e37daad Remove unneeded qDebug() 2014-04-29 17:16:12 -07:00
Ryan Huffman
e0ec0f681f Fix code not compliant with coding standards 2014-04-29 16:50:13 -07:00
Ryan Huffman
edcff0b67f Merge remote-tracking branch 'upstream/master' into RunningScripts 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/FramelessDialog.cpp
	interface/src/ui/FramelessDialog.h
 2014-04-29 16:28:36 -07:00
Thijs Wenker
14e9cb770c Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-29 23:30:15 +02:00
Thijs Wenker
fc2ed9f9fb Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script. 2014-04-29 22:03:51 +02:00
Clément Brisset
7c21fab50c Merge pull request #2736 from SydoxX/master 
Fix CustomUrl
 2014-04-29 12:07:44 -07:00
Konstantin
65706ae5f7 Re-add customUrl.startWith 2014-04-29 20:59:33 +02:00
Konstantin
14b91aa04b Remove 0,0,0 entry 2014-04-29 20:49:40 +02:00
Andrew Meadows
c7dbc5984f add local gravity option parameter for MyAvatar 2014-04-28 16:40:22 -07:00
Konstantin
f829a5b323 Fix CustomUrl 
Fixed custom url so that hifi://domain/ works. Also goes earlier to the location.
 2014-04-27 00:29:38 +02:00
Andrew Meadows
b05a315b5a merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-25 14:52:44 -07:00
Ryan Huffman
225c022511 Update RunningScriptsWidget to use FramelessDialog 2014-04-25 10:10:50 -07:00
Ryan Huffman
84e7b1598c Merge remote-tracking branch 'upstream/master' into RunningScripts 2014-04-25 08:45:54 -07:00
Andrew Meadows
0b5c1b0a9a add MyAvatar::_motionBehaviors (for obeyGravity) 
Also reconcile Menu checkable set vs script-set collision groups.
 2014-04-24 15:43:03 -07:00
Leonardo Murillo
a21991c5c2 Fixing xml parsing 2014-04-24 16:22:34 -06:00
Leonardo Murillo
f4c98a8fa4 Fixing xml parsing 2014-04-24 16:21:49 -06:00
Leonardo Murillo
27002a9406 Casting to QUrl 2014-04-24 15:10:37 -06:00
Leonardo Murillo
ad0f0118bc fixes for new versioning: 2014-04-24 15:01:37 -06:00
Stojce Slavkovski
fc6d1b6575 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-04-24 22:48:57 +02:00
Mohammed Nafees
29d64373b4 Merge branch master 2014-04-24 18:52:59 +05:30
Mohammed Nafees
dd74ea64e7 Further changes for child like behaviour 2014-04-24 17:18:24 +05:30
Atlante45
f68d2d16a8 Inserted a char by mistake 2014-04-23 11:05:16 -07:00
Atlante45
ceb5208102 CR 2014-04-23 11:00:44 -07:00
Atlante45
ae566c55f6 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-23 10:38:29 -07:00
Stojce Slavkovski
e9962241be Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-04-23 18:12:49 +02:00
Philip Rosedale
ee929f2551 Merge pull request #2712 from matsukaze/master 
Job #19574. Add new audio oscilloscope.
 2014-04-22 20:22:57 -07:00
AndrewMeadows
94fabf7875 Merge pull request #2709 from ZappoMan/shared_and_weak_pointers 
Voxel/Particle Server Performance Improvements
 2014-04-22 10:28:39 -07:00
Atlante45
ddf14b0842 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-22 10:22:30 -07:00
Thijs Wenker
59cc930556 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-22 13:12:38 +02:00
matsukaze
6e575bc8af Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-22 06:54:53 -04:00
matsukaze
ff7a1bd60f Job #19574. Add audio oscilloscope.' 2014-04-22 06:53:59 -04:00
Atlante45
fd20686f0f Removed Systime.h includes 2014-04-21 17:23:06 -07:00
Atlante45
681aab5bf0 Remove printf and replace them by qDebug() 2014-04-21 16:17:45 -07:00
Atlante45
0479aaba46 Some gettimeofday removal fixes 2014-04-21 15:26:43 -07:00
Atlante45
f7f30e118c More gettimeofday cleanup 2014-04-21 15:17:11 -07:00
Thijs Wenker
9faee0d82d - Style 
- Script Editor can run script file once at time, but you can still start multiple scripts through the original ways.
 2014-04-21 21:37:49 +02:00
ZappoMan
25a859f95e Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 2014-04-21 10:12:34 -07:00
Stojce Slavkovski
5223673087 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-04-21 11:22:29 +02:00
Thijs Wenker
23068b0356 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-21 05:26:42 +02:00
Thijs Wenker
c016d6557e - few Adjustments in Application class for Script editor 
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
 2014-04-21 05:25:28 +02:00
Brad Hefta-Gaub
b9dd276e32 Merge pull request #2700 from SydoxX/PageUp/Down 
Add PageUp/Down to controls
 2014-04-20 20:20:14 -07:00
Stojce Slavkovski
550cf6b8ea Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-04-19 18:05:01 +02:00
Konstantin
615f8b8dad Fix spacing 2014-04-19 16:35:48 +02:00