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

26717 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
7d0000c537 fix warning about returning ref to temp variable 2015-06-11 08:38:03 -07:00
Sam Gateau
7685fe2229 Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool 2015-06-11 06:40:21 -07:00
Brad Davis
fa27550df4 Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 02:21:02 -07:00
Brad Davis
ef52035300 Working on functional overlays 2015-06-11 02:20:51 -07:00
Clément Brisset
d448a3be7f Merge pull request #5101 from ZappoMan/fix-attachments 
Get avatar attachments rendering again
 2015-06-11 10:35:49 +02:00
Brad Davis
ac0fc5d974 Working on oculus overlay code 2015-06-11 00:57:58 -07:00
Philip Rosedale
b32994b359 Merge pull request #5083 from ctrlaltdavid/20551 
CR for Job #20551 - Create a directory button that opens up the Directory. Similar to the marketplace
 2015-06-10 22:32:25 -07:00
Seth Alves
8bd80c511e make stick follow mouse motion 2015-06-10 21:08:00 -07:00
Seth Alves
ba4fd7adf6 windows didn't like EntityActionFactoryInterface::factory not returning an error 2015-06-10 19:23:01 -07:00
Seth Alves
4216308b9b Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 19:05:25 -07:00
ZappoMan
93c0bd63e9 fix debug rendering transforms 2015-06-10 18:54:07 -07:00
Seth Alves
45c7cd4929 respond to code review, add a simple hold-a-stick script 2015-06-10 18:48:51 -07:00
Brad Hefta-Gaub
5ba9880602 Merge pull request #5100 from AndrewMeadows/inertia 
reset simulation bid counters whenever an object is activated
 2015-06-10 17:27:46 -07:00
Brad Hefta-Gaub
c36912ae27 Merge pull request #5098 from jherico/mac_cursor_fix 
Fix doubled cursor on OSX
 2015-06-10 17:24:40 -07:00
Seth Alves
eccf4eb8a8 hold action works 2015-06-10 17:05:49 -07:00
ZappoMan
139855f487 handle remove attachment case 2015-06-10 16:13:17 -07:00
Brad Hefta-Gaub
409e099638 Merge pull request #5099 from venkatn93/master 
Sanitizing entityProperties.html
 2015-06-10 15:57:59 -07:00
ZappoMan
e06422825a mostly getting attachments working again 2015-06-10 15:46:54 -07:00
Niraj Venkat
9ed8daa97c Removing unnecessary functions 2015-06-10 15:33:07 -07:00
Seth Alves
1c0c7f0fe3 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 15:30:28 -07:00
Brad Davis
c77c41405d Merge remote-tracking branch 'sam/yellow' into render_cursor 2015-06-10 15:30:27 -07:00
Brad Davis
ad265b4bbb Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-10 15:29:37 -07:00
Andrew Meadows
2f32d358c3 merge 2015-06-10 15:27:08 -07:00
Sam Gateau
1f62fb4b6f Adding standard vertex and pixel shaders for drawing texture in applicationOverlay 2015-06-10 15:24:29 -07:00
Brad Davis
296d2511e4 Merge pull request #5094 from venkatn93/master 
Hyperlink property group and hyperlink UI added
 2015-06-10 14:58:10 -07:00
Andrew Meadows
6497ac6c82 renderBoundingBox() for sim-ownership debug 2015-06-10 14:24:00 -07:00
Bradley Austin Davis
1dfc9c89eb Fix doubled cursor on OSX 2015-06-10 13:57:48 -07:00
Leonardo Murillo
3bd0c7bd87 Code Review changes 2015-06-10 14:35:52 -06:00
Brad Davis
55ed94a5af Merge remote-tracking branch 'upstream/master' into cursor_manager 2015-06-10 13:27:07 -07:00
Brad Davis
ca1af77763 Working on cursor manager 2015-06-10 13:24:56 -07:00
Leonardo Murillo
3708f5ec96 Code Review changes 2015-06-10 14:15:26 -06:00
Leonardo Murillo
869461a01b Code Review changes 2015-06-10 14:14:00 -06:00
Niraj Venkat
182a3e918c Hyperlink properties now propagate locally and over network 2015-06-10 13:12:18 -07:00
Andrew Meadows
0e12cdc39e woops, forgot to include this in last commit 2015-06-10 12:41:15 -07:00
Andrew Meadows
8d41960cc3 reset simulation bid counters on object activation 2015-06-10 12:40:14 -07:00
Leonardo Murillo
8f72763f17 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-10 13:18:20 -06:00
Seth Alves
3dcc6c9b8c make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus. 2015-06-10 12:04:44 -07:00
Sam Gateau
780547b6c7 Merge branch 'render_cursor' of https://github.com/jherico/hifi into yellow 2015-06-10 11:35:55 -07:00
Brad Davis
863402aea2 Merge branch 'master' into cursor_manager 2015-06-10 10:20:57 -07:00
Brad Davis
1846ead27c Merge branch 'master' into vs2015 2015-06-10 10:11:58 -07:00
Niraj Venkat
c45d409383 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-10 09:51:17 -07:00
Niraj Venkat
4617b7331c Working on creating functions to serialize and deserialize properties 2015-06-10 09:50:47 -07:00
Brad Davis
7374fb84e8 Working on fixing overlays with team-teaching merge 2015-06-10 09:36:14 -07:00
Clément Brisset
059b29da83 Merge pull request #5090 from ericrius1/lineClamping 
clamping line points between 0 and TREE_SCALE
 2015-06-10 18:04:10 +02:00
Brad Davis
5e279367b7 Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-10 08:57:45 -07:00
ZappoMan
aa05d9f67c Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments 2015-06-10 08:53:33 -07:00
Clément Brisset
73fce52407 Merge pull request #5091 from birarda/master 
store an in-memory history of the last addresses
 2015-06-10 17:52:39 +02:00
Eric Levin
286b7bf573 changed comment to use TREE_SCALE instead of 16000 2015-06-10 08:48:26 -07:00
Brad Hefta-Gaub
ef58aa527e Merge pull request #5093 from Atlante45/debug 
Fix ghost avatars/displaynames
 2015-06-10 08:44:18 -07:00
Brad Davis
94c414e4e8 Add unit quad, commonly used in compositing the overlays 2015-06-10 08:12:58 -07:00