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

10174 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
c71b10f639 Added toggles for rendering bucky balls, particles. 2014-02-24 17:43:47 -08:00
ZappoMan
3a5bbfd989 Merge pull request #2061 from PhilipRosedale/master 
Added DC offset correction for crappy sound input devices, mousewheel voxel edit size
 2014-02-24 17:32:16 -08:00
Philip Rosedale
fffd45019d Added new sounds, default tool ON 2014-02-24 17:17:15 -08:00
Philip Rosedale
3a4ebe878b don’t drag avatar along during orbit, yet. 2014-02-24 17:03:14 -08:00
Philip Rosedale
fa3b109e1d Merge branch 'master' of https://github.com/worklist/hifi 2014-02-24 16:43:39 -08:00
Stephen Birarda
83f7c17279 move QStringList include to DomainServer header 2014-02-24 15:49:52 -08:00
Stephen Birarda
6d56ab3a30 use toDouble instead of toInt for Qt 5.1 compatibility 2014-02-24 15:27:12 -08:00
Stephen Birarda
672c6a9ed1 fix complaint for incomplete type QStringList 2014-02-24 15:23:47 -08:00
Jose Carlos
64e75bb4ab fixed typo 2014-02-25 00:19:52 +01:00
Stephen Birarda
c1b45d7eaa Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-24 15:18:21 -08:00
Stephen Birarda
61fcfd17e3 add org and app info to AC for settings ini 2014-02-24 15:16:56 -08:00
Stephen Birarda
f20808b47f remove option to drive from transmitter 2014-02-24 15:11:02 -08:00
Stephen Birarda
4a4001a049 remove pairing logic from interface 2014-02-24 15:03:10 -08:00
Stephen Birarda
f72a87a47e remove the pairing-server target 2014-02-24 15:00:36 -08:00
Stephen Birarda
00b4cd799e remove the data-server from the repo 2014-02-24 14:56:17 -08:00
Stephen Birarda
4dea4b586b Merge pull request #2072 from birarda/master 
tweaks to bot script
 2014-02-24 14:35:05 -08:00
Stephen Birarda
3a90e175e0 tweaks to bot script 2014-02-24 14:34:13 -08:00
Jose Carlos
976732120e fixed typo 2014-02-24 23:33:25 +01:00
Jose Carlos
ae87ab3b79 Undone a change to try to prevent the decay effect in the text rendering 2014-02-24 23:26:42 +01:00
AndrewMeadows
cdeb6ce51d Merge pull request #2070 from ey6es/master 
Fix display name for own avatar, added ribbon.js example that I had lying around.
 2014-02-24 14:05:46 -08:00
Jose Carlos
438131f3e9 Reverted myAvatar::render call to test if the decay effect is gone 2014-02-24 22:38:50 +01:00
Andrzej Kapolka
2cea83a599 Proper header on ribbon.js, show display name for own avatar. 2014-02-24 13:36:43 -08:00
Stephen Birarda
050d223b3a add domain connection reset to NodeList reset 2014-02-24 13:33:52 -08:00
Stephen Birarda
27c779666b add auth to assignment-client, fix refresh of static assignments 2014-02-24 13:29:32 -08:00
Andrzej Kapolka
1167ecdf77 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-24 13:21:25 -08:00
Andrzej Kapolka
40d9fffb7f Fix for warning. 2014-02-24 13:19:32 -08:00
Jose Carlos
2bf3d2547a Merge remote-tracking branch 'upstream/master' into 19489 2014-02-24 22:03:03 +01:00
Jose Carlos
c8c371b6f4 Changed the displayname background rect: instead of having squared 
corners, they are bevel
Added some test code to prevent the decay effect in the text rendering
 2014-02-24 22:02:06 +01:00
Leonardo Murillo
9ce4e424ef Merge pull request #2069 from birarda/master 
fix for assignment-client scripts with multiple instances
 2014-02-24 14:46:09 -06:00
Andrzej Kapolka
8cb5c639fb Added ribbon example that I had lying around. 2014-02-24 12:22:10 -08:00
Stephen Birarda
fcb36f0aca switch to target specific username/pass 2014-02-24 12:07:07 -08:00
Stephen Birarda
9771e1bb12 resolve conflicts on merge with upstream master 2014-02-24 12:06:10 -08:00
AndrewMeadows
7f07d854cf Merge pull request #2068 from ey6es/master 
Fixes for camera transitions, seeing inside head.
 2014-02-24 12:02:08 -08:00
Stephen Birarda
9dc460bab4 make multiple instances of scripted assignment use diff UUID 2014-02-24 11:56:14 -08:00
Andrzej Kapolka
e40fe85c36 Updating the camera mode every frame screws with the scripts, so revert to 
updating it when the menu changes.
 2014-02-24 11:42:47 -08:00
Andrzej Kapolka
8efc4d52ba Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-24 11:34:12 -08:00
Andrzej Kapolka
d80b52dc9f Fixes for camera mode transitions, seeing inside head. 2014-02-24 11:33:52 -08:00
Stephen Birarda
a8493ecaa2 cleanup login/logout in menu, logout only when in 2014-02-24 11:11:36 -08:00
ZappoMan
4fc5444628 Merge pull request #2067 from ZappoMan/scriptreload 
fix reload of scripts
 2014-02-24 10:28:04 -08:00
ZappoMan
6ea2c81e68 fix reload of scripts 2014-02-24 10:10:00 -08:00
Stephen Birarda
dbefd81ba0 Merge pull request #2066 from birarda/master 
changes to the bot script
 2014-02-24 10:04:28 -08:00
Stephen Birarda
6cef72473d changes to the bot script 2014-02-24 10:04:08 -08:00
Stephen Birarda
5b83b7c434 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-24 09:58:32 -08:00
ZappoMan
3d1c4251e3 Merge pull request #2064 from ZappoMan/more_edit_js 
correctly shutdown slider
 2014-02-24 09:36:54 -08:00
ZappoMan
6591a4b7fa correctly shutdown slider 2014-02-24 09:36:18 -08:00
Philip Rosedale
246bb1fd2d Physics test ‘buckyballs’ moved to application.cpp 2014-02-24 00:06:50 -08:00
Philip Rosedale
a9849c131f EditVoxels: avatar follows orbit, mousewheel updates selection 2014-02-23 22:48:35 -08:00
Philip Rosedale
907740eb8e Merge pull request #2047 from ey6es/metavoxels 
Another metavoxel checkpoint: more work on streaming, editable attributes, changed to use existing session code, work on "spanners" (objects that span multiple octree nodes).
 2014-02-23 21:39:44 -08:00
Philip Rosedale
26541e12b6 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-23 21:08:54 -08:00
Philip Rosedale
197b039a42 remove buckyballs physics testing code from hand code 2014-02-23 21:08:38 -08:00