Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 11:35:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26536 commits 76 branches 59 tags 1.2 GiB
Commit graph

12295 commits

Author SHA1 Message Date
Leonardo Murillo
8f72763f17 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-10 13:18:20 -06:00
Atlante45
8570fe0c19 Shared ptr tweaks 2015-06-10 15:02:26 +02:00
Atlante45
3af8bec3d7 Fix ghost avatars/displaynames 2015-06-10 14:59:27 +02:00
Brad Hefta-Gaub
fb4e5a70bd Merge pull request #5077 from jherico/render_cursor 
Always use GL rendered cursor & fix broken cursor after merge
 2015-06-09 12:09:24 -07:00
Brad Davis
78ab6a03af Fixing broken cursor rendering from team-teaching merge 2015-06-09 11:47:19 -07:00
Leonardo Murillo
1d785c714b Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-09 09:01:50 -06:00
Seth Alves
983ae5b2f0 quiet compiler, fix some whitespace 2015-06-08 21:19:37 -07:00
Brad Davis
c360dde71a Merge branch 'master' into render_cursor 
Conflicts:
	interface/src/Application.cpp
 2015-06-08 20:18:32 -07:00
ZappoMan
1dca379e1a dead code removal machine 2015-06-08 15:06:44 -07:00
ZappoMan
b50b7dd500 CR feedback 2015-06-08 14:36:31 -07:00
ZappoMan
8fa31ec521 dead code removal machine 2015-06-08 14:30:31 -07:00
Leonardo Murillo
bd16072053 Conflict fixing 2015-06-08 15:00:06 -06:00
Leonardo Murillo
7aee293df4 Buttons are connected and execting old functions 2015-06-08 14:56:46 -06:00
ZappoMan
24c8e7d0e6 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 13:50:50 -07:00
Leonardo Murillo
edce36f5a1 Checkpoint - buttons in place 2015-06-08 14:29:10 -06:00
Leonardo Murillo
bd85ce1312 Auto Update checkpoint - dialog is QML and populated with real data 2015-06-08 13:55:28 -06:00
ZappoMan
5d6112d9c5 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 12:29:32 -07:00
Brad Davis
b3534210e4 Always use GL rendered cursor 2015-06-08 11:51:35 -07:00
Stephen Birarda
666830c04d add a sound once first AM packet received 2015-06-08 11:30:12 -07:00
Leonardo Murillo
83b7054138 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-08 11:55:47 -06:00
Atlante45
36dfec7827 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 19:20:33 +02:00
Atlante45
141d8fa055 Use setUniformTexture 2015-06-08 18:55:13 +02: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
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
Atlante45
2bee021a66 Fix Avatar display names 2015-06-08 15:26:17 +02: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
Leonardo Murillo
68b419deec Syncing 2015-06-05 17:11:32 -06:00
David Rowe
7fb434613c Fix #include for Unix 2015-06-05 15:57:09 -07:00
David Rowe
c7c355c19f Remove circular login dialog variation 2015-06-05 15:37:25 -07:00
Leonardo Murillo
2236ccf0e1 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-05 16:18:03 -06:00
Leonardo Murillo
dea80d1757 Styling update dialog and working towards passing build details from c++ to qml 2015-06-05 16:17:54 -06: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
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
David Rowe
f168385798 Add spinner in place of "Logging in..." 2015-06-05 12:57:40 -07:00
ZappoMan
f8a2fff5a7 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 11:06:10 -07:00
ZappoMan
7ebe64b52f Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 11:01:17 -07:00
Seth Alves
4e10c28b41 merge from upstream 2015-06-05 10:31:13 -07:00
Seth Alves
edb3622c85 Merge pull request #5037 from AndrewMeadows/inertia 
collision groups for physical objects
 2015-06-05 10:26:28 -07:00
Brad Davis
16f55c7557 Fix the skybox jiggle in the HMD 2015-06-05 09:52:56 -07:00
David Rowe
562228e924 Change login password recovery link text 2015-06-05 09:47:34 -07:00
ZappoMan
807cc3db24 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 09:37:39 -07:00
Ryan Huffman
b22ed34825 Merge pull request #5051 from ZappoMan/team-teaching-optimize-offset 
TEAM TEACHING - improvements to avatar part clipping
 2015-06-05 09:26:45 -07:00
David Rowe
37aefe73f8 Remove unnecessary semicolons 2015-06-05 09:07:07 -07:00