Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-09 05:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26627 commits 69 branches 58 tags 1.2 GiB
Commit graph

26627 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
5d6112d9c5 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 12:29:32 -07:00
Brad Hefta-Gaub
d83c3be2a8 Merge pull request #5071 from Atlante45/team-teaching 
Team Teaching - Fix Avatar display names/billboards
 2015-06-08 12:12:45 -07:00
Brad Davis
b3534210e4 Always use GL rendered cursor 2015-06-08 11:51:35 -07:00
Brad Hefta-Gaub
a1ba330e5b Merge pull request #5075 from samcake/daft 
TEAM TEACHING: Fixing the broken skinning
 2015-06-08 11:43:37 -07:00
Stephen Birarda
4e755e304b fix spacing in new JS file 2015-06-08 11:31:24 -07:00
Stephen Birarda
666830c04d add a sound once first AM packet received 2015-06-08 11:30:12 -07:00
David Rowe
f51feca37d Add directory button 2015-06-08 11:29:35 -07:00
Sam Gateau
87536b2f9d Fixing the skinning issue 2015-06-08 11:22:16 -07:00
Howard Stearns
6668de56cd Fix AudioInjector::restart() for the non-local case. 2015-06-08 10:34:56 -07:00
Atlante45
c8c372bf3a Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 19:27:49 +02:00
Brad Hefta-Gaub
06c49c9dcf Merge pull request #5072 from samcake/daft 
FIxing merge on moday morning
 2015-06-08 10:21:25 -07:00
Atlante45
36dfec7827 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 19:20:33 +02:00
samcake
d9b7a42f60 FIxing merge 2015-06-08 19:06:04 +02:00
Atlante45
141d8fa055 Use setUniformTexture 2015-06-08 18:55:13 +02:00
Brad Hefta-Gaub
ec55aa74ff Merge pull request #5069 from samcake/daft 
TEAM TEACHING : Improving the transparent rendering
 2015-06-08 09:48:32 -07:00
samcake
cc55056eef Merge pull request #5070 from ZappoMan/team-teaching-drawperf 
TEAM TEACHING - cache the Item bounds across sub tasks
 2015-06-08 18:42:34 +02:00
samcake
5e351c0328 FIxing the transparent rendering on Mac 2015-06-08 18:36:12 +02:00
ZappoMan
84c37bd301 cache bounds with item ids in DrawTask 2015-06-08 09:05:16 -07:00
ZappoMan
46a8b831fc cache bounds with item ids in DrawTask 2015-06-08 09:01:12 -07:00
Atlante45
31e565868d Bind simple textured program 2015-06-08 17:15:50 +02:00
Atlante45
8eeb5e435c Enable/Disable texture for avatar billboards 2015-06-08 17:13:37 +02:00
samcake
1bff9a17e1 Fixing compilation issues and shader issues on Mac, not fully fixing the transparency though 2015-06-08 17:05:28 +02:00
Atlante45
d3eaa4755c Partial fix to billboards 2015-06-08 16:43:38 +02:00
Atlante45
34bdcebbf6 More display name work 2015-06-08 16:28:15 +02:00
Sam Gateau
8a93db6f5a more typos and issues on mac 2015-06-08 07:25:32 -07:00
Sam Gateau
862d6abd79 Typo on mac build 2015-06-08 06:57:04 -07:00
Sam Gateau
b7d88e2642 add apotential fix to the issue with viewInverse for Legacy transform path support 2015-06-08 06:46:45 -07:00
Atlante45
2bee021a66 Fix Avatar display names 2015-06-08 15:26:17 +02:00
Sam Gateau
c47cee3f3b clean code for PR 2015-06-08 05:59:10 -07:00
Sam Gateau
054809d570 clean code for PR 2015-06-08 05:51:23 -07:00
Sam Gateau
3196c5ca77 better highlights blending 2015-06-08 05:41:36 -07:00
Sam Gateau
5e04b399d8 fixing the wrong matrix used 2015-06-08 03:07:17 -07:00
Sam Gateau
de61f4ea0b Gettting th ehighlight on transparent to work 2015-06-08 02:52:13 -07:00
Brad Davis
94cd0762bd Merge pull request #5059 from ctrlaltdavid/20560 
CR for #20560 - Re-style QML Login Window
 2015-06-07 13:19:14 -07:00
David Rowe
d7866d9981 Rename previous Dialog to VrDialog 2015-06-06 10:48:07 -07:00
David Rowe
bbde367386 Rename new Dialog to DialogContainer 2015-06-06 10:42:49 -07:00
Sam Gateau
8d3a3221b0 shuffling the rendering steps to get to render transparent and light it correctly 2015-06-06 09:50:56 -07:00
David Rowe
7fb434613c Fix #include for Unix 2015-06-05 15:57:09 -07:00
Stephen Birarda
a63811a491 Merge pull request #5066 from venkatn93/master 
Title bar shows domain IDs upon teleport
 2015-06-05 18:55:02 -04:00
David Rowe
c7c355c19f Remove circular login dialog variation 2015-06-05 15:37:25 -07:00
Niraj Venkat
141ff70a60 Some changes to constants 2015-06-05 15:36:42 -07:00
Andrew Meadows
886ec63072 Merge pull request #5067 from sethalves/actions 
undo unneeded/breaky change in grab.js
 2015-06-05 14:02:35 -07:00
Seth Alves
037a70b03a undo unneeded/breaky change in grab.js 2015-06-05 13:47:07 -07:00
Niraj Venkat
827d8bd854 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-05 13:33:41 -07:00
Niraj Venkat
a3f19e9d4c Fixing title bar update on teleport 2015-06-05 13:33:14 -07:00
Andrew Meadows
30389ad51f Merge pull request #5039 from sethalves/actions 
Actions
 2015-06-05 13:26:44 -07:00
David Rowe
ee8449712c Code review and tidying 2015-06-05 13:23:06 -07:00
David Rowe
7e9122e3d1 Replace login background SVGs with QML rectangles 2015-06-05 13:15:18 -07:00
ZappoMan
08ea3368d7 hacking on DrawTask perf 2015-06-05 13:10:51 -07:00
David Rowe
f168385798 Add spinner in place of "Logging in..." 2015-06-05 12:57:40 -07:00