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

12551 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Atlante45
9bdcfe6d04 Undo now fully support local subtrees 2014-04-24 11:01:12 -07:00
Philip Rosedale
04f3e01a1b Merge pull request #2720 from ey6es/master 
Added option to render joint constraints, changed safeEulerAngles so that z (rather than y) is in [-pi/2, pi/2], added ability to set end effector rotation in IK, added option to avoid aligning forearms with wrists.
 2014-04-24 09:54:48 -07: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
2494e589a9 Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo 2014-04-23 17:36:01 -07:00
Ryan Huffman
1a5dbf3da6 Merge branch '19554-2' of github.com:huffman/hifi into 19554-2 2014-04-23 16:17:16 -07:00
Ryan Huffman
b0e1eab7ed Fix chat input textbox to use native scrollbar 
The border around the textedit was causing QT to use a non-native
scrollbar.  Moving the box into a frame that contains the border styling
fixes this.
 2014-04-23 16:15:51 -07:00
Andrzej Kapolka
4f8c1f9c65 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 16:09:23 -07:00
Clément Brisset
d441e6a453 Merge pull request #2717 from AndrewMeadows/inertia 
avatar bounding capsule collision against voxels
 2014-04-23 16:06:14 -07:00
Ryan Huffman
0cba95e7ad Reorder property initialization in FramelessDialog 2014-04-23 15:37:49 -07:00
Ryan Huffman
1774f6c9bd Add threshold to auto scroll 2014-04-23 15:37:28 -07:00
Ryan Huffman
d56a4e169e Add ChatInputArea 2014-04-23 15:24:21 -07:00
Andrew Meadows
10265a4a3e temp disable of screen flash for avatar collisions 2014-04-23 14:37:24 -07:00
Atlante45
a24f092efe Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo 2014-04-23 13:47:12 -07:00
Andrew Meadows
96ca537400 removing unused motion-state timers 2014-04-23 13:44:25 -07:00
Andrew Meadows
c5f1a8abd6 formatting 2014-04-23 13:37:13 -07:00
Andrew Meadows
fe42f66cc9 change x.f to be x.0f as per the coding standard 2014-04-23 13:27:43 -07:00
Ryan Huffman
95357a7c35 Update chat input area to use a 14pt font 2014-04-23 12:30:40 -07:00