Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-30 14:02:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
12524 commits 71 branches 56 tags 1.2 GiB
Commit graph

1966 commits

Author SHA1 Message Date
Stephen Birarda
53eddab43c fix typo for OAuth header include 2014-05-02 15:52:50 -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
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
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
Philip Rosedale
ee929f2551 Merge pull request #2712 from matsukaze/master 
Job #19574. Add new audio oscilloscope.
 2014-04-22 20:22:57 -07:00