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

12669 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
3143e10bd8 CR 2014-04-25 13:33:59 -07:00
Stephen Birarda
8e12c0d8e5 pass the owner scope to auth requests 2014-04-25 13:22:18 -07:00
ZappoMan
7c1b5ba092 Merge branch 'master' of https://github.com/worklist/hifi into fixtimestamps 
Conflicts:
	libraries/shared/src/SharedUtil.cpp
 2014-04-25 13:14:52 -07:00
Brad Hefta-Gaub
588128ea53 Merge pull request #2731 from Atlante45/fix_for_non_fired_timestamp_timer 
Fix timestamp timer not fired
 2014-04-25 13:02:19 -07:00
Ryan Huffman
958238efa7 Cleanup implementation of script loading to reduce copy/paste 2014-04-25 12:45:26 -07:00
Ryan Huffman
8480d02414 Fix 1-9 keys not working in Running Scripts widget 2014-04-25 12:44:46 -07:00
Atlante45
8b4a910040 Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
Atlante45
860766fb49 Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo 2014-04-25 11:41:43 -07:00
ZappoMan
6acdf9cd6c fix issues with bad timestamps 2014-04-25 11:21:02 -07:00
Ryan Huffman
c3d8cce4a6 Add plus icon to LoadScript button 2014-04-25 10:30:56 -07:00
Ryan Huffman
5a8a78e7b8 Update location of Load Script button 2014-04-25 10:14:18 -07:00
Ryan Huffman
61e8a20550 Update running scripts widget to forward mouse release events 2014-04-25 10:11:56 -07:00
Ryan Huffman
76d8090938 Disallow resizing of running scripts widget 2014-04-25 10:11:34 -07:00
Ryan Huffman
dd844437b6 Add option to disallow resizing in FramelessDialog 2014-04-25 10:11:22 -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
f91c098589 merge 2014-04-24 19:13:22 -07:00
Andrew Meadows
afb12bcd70 add swissArmyJetpack.js 2014-04-24 19:12:23 -07:00
Philip Rosedale
9884d74f60 Merge pull request #2728 from Atlante45/fix_audio_jitter 
Fix audio jitter
 2014-04-24 18:25:16 -07:00
Atlante45
4927a77382 Some testing with editModels.js 2014-04-24 18:15:39 -07:00
Atlante45
cf7fe2306b Fix audio jitter 2014-04-24 18:10:51 -07:00
Philip Rosedale
c66805e2fb Merge pull request #2727 from Atlante45/fix_error_from_remove_gettimeofday 
Fix error introduced with gettimeofday removing + spelling mistake
 2014-04-24 17:40:47 -07:00
Atlante45
01637e8037 Fix error introduced with gettimeofday removing + spelling mistake 2014-04-24 17:37:48 -07:00
Clément Brisset
fd8ec9b5c2 Merge pull request #2723 from huffman/19554-2 
19554 - Chat Updates
 2014-04-24 16:44:22 -07:00
Ryan Huffman
d88897ccc7 Add error box when going to user/location that doesn't exist 2014-04-24 15:55:34 -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
Stephen Birarda
482c2078ed Merge pull request #2725 from murillodigital/master 
Changes to XML structure for multiple platform versioning
 2014-04-24 15:24:53 -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
Stephen Birarda
c26fc7a838 pull OAuth code from URL in domain-server 2014-04-24 15:05:41 -07:00
Stephen Birarda
4a68c2e9c4 allow DS to handle incoming HTTPS requests 2014-04-24 14:58:08 -07:00
Ryan Huffman
5d71c97195 Merge remote-tracking branch 'origin/19554-2' into 19554-2 2014-04-24 14:56:11 -07:00
Ryan Huffman
b69fa73dfa Unsplit a line in FramelessDialog 2014-04-24 14:54:57 -07:00
Ryan Huffman
7b09812028 Remove insertFromMimeData override in ChatMessageArea 2014-04-24 14:54:26 -07:00
Ryan Huffman
ccad0aed9e Move ChatInputArea code in header to .cpp 2014-04-24 14:54:01 -07:00
Stephen Birarda
0bc17b0852 hand certificate and private key to QSslSocket instances 2014-04-24 14:35:18 -07:00
Andrew Meadows
0a7a5031ee expose COLLISION_GOUP_* constants to JS 2014-04-24 14:17:10 -07:00
Stephen Birarda
96de0c1af1 setup the domain-server HTTPS server 2014-04-24 14:13:17 -07:00
Leonardo Murillo
27002a9406 Casting to QUrl 2014-04-24 15:10:37 -06:00
Stephen Birarda
260966915a add HTTPS versions of webserver classes 2014-04-24 14:06:24 -07:00
Ryan Huffman
a86af6b07f Add Load Script button to RunningScripts Dialog 2014-04-24 14:05:09 -07:00
Leonardo Murillo
ad0f0118bc fixes for new versioning: 2014-04-24 15:01:37 -06:00
Stojce Slavkovski
8f2878953c Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-04-24 22:48:11 +02:00
Stojce Slavkovski
b02883f84d add limits to QXmppArchiveManager 2014-04-24 22:47:42 +02:00
Stojce Slavkovski
c968a4bdb6 set QXmppArchiveManager limits 2014-04-24 22:45:25 +02:00
Stojce Slavkovski
2c35fe433d Try to load past messages with QXmppArchiveManager 2014-04-24 22:44:52 +02:00
Andrew Meadows
73d0674565 expose MyAvatar.collisionGroups to JS 2014-04-24 11:19:08 -07:00
Atlante45
1844eb2c9e Pre CR tweaks 2014-04-24 11:12:01 -07:00
Andrew Meadows
f07a418a27 namechange CollisionFlags --> CollisionGroups 2014-04-24 11:07:49 -07:00
Atlante45
37fbbb0297 Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo 2014-04-24 11:01:34 -07:00