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

1670 commits

Author SHA1 Message Date
ZappoMan
5b1037cc63 switching to OctreeQuery instead of VoxelQuery 2014-02-26 01:22:53 -08:00
Philip Rosedale
46469612c7 Merge pull request #2108 from ZappoMan/remove_cpp_voxel_editing 
Remove cpp voxel editing
 2014-02-25 22:07:54 -08:00
ZappoMan
5fdf114ff0 removed more cruft 2014-02-25 21:53:20 -08:00
ZappoMan
869b35a7aa remove old c++ implementation of voxel tools 2014-02-25 21:38:10 -08:00
ZappoMan
d3594808d9 some cruft cleanup 2014-02-25 20:45:49 -08:00
ZappoMan
42ddc82ac4 possible fix to windows assert 2014-02-25 20:23:38 -08:00
Stephen Birarda
bf3b5c07d5 Merge pull request #2093 from ZappoMan/menu_js 
Adds support for editing application Menus to JS
 2014-02-25 17:40:39 -08:00
Andrzej Kapolka
8554c1dfbf Force a minimum convergence distance on the eyes. Closes #2100. 2014-02-25 16:50:59 -08:00
ZappoMan
81bff60645 change singleton approach to not require delete 2014-02-25 14:53:57 -08:00
ZappoMan
e03c7be5ef moved MenuScriptingInterface to own files 2014-02-25 14:33:37 -08:00
Stephen Birarda
ce3d6d2fca reset nodelist if domain-server stops talking to you, closes #2092 2014-02-25 13:07:39 -08:00
ZappoMan
263d682fb9 Merge branch 'master' of https://github.com/worklist/hifi into menu_js 2014-02-25 12:20:15 -08:00
Stephen Birarda
b09ed1dff1 present a login window on app start 2014-02-25 10:53:13 -08:00
Philip Rosedale
e637e48598 Merge pull request #2076 from birarda/authentication 
groundwork for secure node communication via data-server
 2014-02-25 10:07:55 -08:00
ZappoMan
03f8885cad first cut at menus JS 2014-02-24 19:09:22 -08:00
Andrzej Kapolka
c71b10f639 Added toggles for rendering bucky balls, particles. 2014-02-24 17:43:47 -08:00
Philip Rosedale
fa3b109e1d Merge branch 'master' of https://github.com/worklist/hifi 2014-02-24 16:43:39 -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
9771e1bb12 resolve conflicts on merge with upstream master 2014-02-24 12:06:10 -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
6ea2c81e68 fix reload of scripts 2014-02-24 10:10:00 -08:00
Philip Rosedale
246bb1fd2d Physics test ‘buckyballs’ moved to application.cpp 2014-02-24 00:06:50 -08:00
Andrzej Kapolka
8745ca3139 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-23 20:13:23 -08:00
Andrzej Kapolka
e470b1c41d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-02-21 18:26:40 -08:00
Stephen Birarda
6df317e8e6 update user's domain in data-server after connection to new one 2014-02-21 16:22:17 -08:00
Andrzej Kapolka
ac02609bc2 The basic billboard behavior, closes #1864. 2014-02-21 15:38:49 -08:00
Stephen Birarda
340248ac43 resolve conflicts on merge with upstream master 2014-02-21 15:16:15 -08:00
Stephen Birarda
a49893689e store username in local settings so it doesn't need to be reloaded 2014-02-21 15:05:57 -08:00
Stephen Birarda
76e6c9342f parse username returned from data-server 2014-02-21 14:41:43 -08:00
Andrzej Kapolka
10ce2cb3f0 Working on sending the billboards over the network. 2014-02-21 11:49:29 -08:00
Andrzej Kapolka
495447fc0d Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo 2014-02-21 10:19:52 -08:00
Andrzej Kapolka
18ea1d6a85 More work on billboards. 2014-02-21 10:16:06 -08:00
Andrzej Kapolka
d8321bd419 Merge pull request #2034 from birarda/master 
fixes for scripted avatars
 2014-02-21 10:14:41 -08:00
Andrzej Kapolka
6b90a3994d Working on avatar billboards. 2014-02-20 19:22:59 -08:00
Andrzej Kapolka
09ad4046f8 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-20 17:20:07 -08:00
Stephen Birarda
2408d909ba resolve conflicts on merge with upstream master 2014-02-20 12:12:29 -08:00
Andrzej Kapolka
4dab2eb694 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-20 10:45:19 -08:00
Stephen Birarda
7f9794d52b Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-20 10:14:47 -08:00
Stephen Birarda
6f84230d9d resolve conflicts on merge with upstream/master 2014-02-20 10:14:36 -08:00
ZappoMan
0e8cab7349 added Clipboard.nudgeVoxel() and added support for calling clipboard opertations with VoxelDetail as well as xyzs 2014-02-19 20:09:35 -08:00
Stephen Birarda
ee9f8937e3 fix a silly typo 2014-02-19 18:03:34 -08:00
ZappoMan
3a8a880a8b Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard 2014-02-19 17:49:22 -08:00
Stephen Birarda
4ee416ba96 fixes for scripted avatars, closes #2033 2014-02-19 16:55:24 -08:00
Atlante45
b69bdccc8f Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import 2014-02-19 16:11:31 -08:00
Stephen Birarda
57538af8fd give a separate QNetworkAccessManager to the AccountManager 2014-02-19 14:19:00 -08:00
Stephen Birarda
5f130872af repair usage of INI file for QSettings 2014-02-19 14:09:18 -08:00