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

21831 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
375d9eed5b Fix QTimer warning 2015-02-03 15:22:52 -08:00
David Rowe
d9e353e498 Merge branch 'master' into 20280 
Conflicts:
	libraries/networking/src/LimitedNodeList.h
 2015-02-03 14:46:27 -08:00
David Rowe
8dd87aff16 Adjust size of 2D progress bar 2015-02-03 14:27:43 -08:00
David Rowe
46352d34ce Make 3D progress bar match up with notifications 2015-02-03 14:27:43 -08:00
David Rowe
fdf4aeaeab Display 3D progress bar 2015-02-03 14:27:42 -08:00
David Rowe
7beb5bf25f Show and hide progress bar per downloads status 2015-02-03 14:27:41 -08:00
David Rowe
9b6a81cfb0 Display 2D progress bar 2015-02-03 14:27:41 -08:00
David Rowe
1fdebf63a4 Add progress.js; calculate download percent complete value 2015-02-03 14:27:40 -08:00
Brad Hefta-Gaub
b5e62922a2 Merge pull request #4215 from huffman/edit-changes 
A few improvements to editEntities.js
 2015-02-03 13:55:59 -08:00
Brad Hefta-Gaub
81871abd06 Merge pull request #4214 from ctrlaltdavid/20281 
Fix orientation of rectangle3d overlays to match other 3D overlays
 2015-02-03 13:54:19 -08:00
Brad Hefta-Gaub
fa608477b2 Merge pull request #4213 from sethalves/rework-bandwidth-meter 
Rework bandwidth meter
 2015-02-03 13:53:24 -08:00
Atlante45
78a9d002db Remove settings from InboundAudioStream 2015-02-03 12:47:25 -08:00
Atlante45
27459ba861 Settings update 2015-02-03 12:27:30 -08:00
Ryan Huffman
e2b6be2a92 Fix focus behavior when selecting an item without shift 2015-02-03 11:58:39 -08:00
Ryan Huffman
7f0fdbe23e Make auto-focus in editEntities always use ease-on-focus 2015-02-03 11:50:58 -08:00
Ryan Huffman
814d585086 Make the entity list always visible 2015-02-03 11:44:38 -08:00
Ryan Huffman
ba5a96f541 Add Window.setFocus 2015-02-03 11:44:22 -08:00
Ryan Huffman
74dfd29708 Remove Mass from entity properties window 2015-02-03 11:44:01 -08:00
David Rowe
7f7cba8a1b Fix orientation of rectangle3d overlays to match other 3D overlays 2015-02-03 10:54:16 -08:00
Atlante45
aacf61609f Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-03 10:53:44 -08:00
Atlante45
09a9f82256 More settings update 2015-02-03 10:52:50 -08:00
Seth Alves
d2c70936e3 coding standard, remove unneeded asserts 2015-02-03 10:51:35 -08:00
Seth Alves
0fa1273cc9 draw background behind bandwidth overlay stats 2015-02-03 10:51:20 -08:00
Brad Hefta-Gaub
35431a0a4c Merge pull request #4211 from PhilipRosedale/master 
Dice.js script that lets you, well, throw dice
 2015-02-03 10:46:32 -08:00
Stephen Birarda
e07ce23825 resolve conflicts on merge with upstream master 2015-02-03 10:25:17 -08:00
Atlante45
fdade344a3 Move Audio to new settings 2015-02-03 10:15:11 -08:00
Philip Rosedale
6483df69a4 Merge pull request #4209 from sethalves/rework-bandwidth-meter 
Consolidate Network Bandwidth Metrics
 2015-02-03 09:05:28 -08:00
Philip Rosedale
c234f3372f Merge pull request #4212 from huffman/fix-clone-billboard 
Add missing _texture to BillboardOverlay copy ctor
 2015-02-03 09:04:30 -08:00
Ryan Huffman
13ea8ddb9e Add missing _texture to BillboardOverlay copy ctor 2015-02-03 08:52:58 -08:00
Brad Davis
6cfb51283e Working on the text renderer 2015-02-03 01:49:06 -08:00
Brad Davis
5d9aee16cb Merging develop branch 2015-02-03 00:28:52 -08:00
Brad Davis
0fab50a388 Updating example text 2015-02-03 00:27:58 -08:00
Brad Davis
2d029314e6 Merge branch 'develop' into text-renderer 2015-02-02 23:30:16 -08:00
Brad Davis
f7b2266f92 Fixing oglplus find 2015-02-02 23:30:07 -08:00
Brad Davis
68448daa18 Moving closer to the original coordinate system 2015-02-02 23:29:46 -08:00
Brad Davis
8d81607e28 Tweaking the example text renderer 2015-02-02 23:27:57 -08:00
Philip Rosedale
35aeb86acc First version, dice script 2015-02-02 23:15:18 -08:00
Philip Rosedale
28964cfc4c Merge branch 'master' of https://github.com/worklist/hifi 2015-02-02 21:33:05 -08:00
Philip Rosedale
2ae6514c87 Merge pull request #4200 from PhilipRosedale/master 
Planet simulation script
 2015-02-02 21:31:47 -08:00
Philip Rosedale
81fe2d69ba Merge pull request #4207 from huffman/billboard-update 
Update BillboardOverlay to use NetworkTexture
 2015-02-02 21:30:18 -08:00
Atlante45
cc58cb0f03 Update domain-server and Application setting handles 2015-02-02 20:06:13 -08:00
Atlante45
5388ed1c4a Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-02 18:38:09 -08:00
Atlante45
f0b5cd195d Renaming + end of file spaces 2015-02-02 18:37:49 -08:00
Stephen Birarda
9a0c102fb6 remove some extra spaces in Application 2015-02-02 17:27:53 -08:00
Atlante45
1e64fc84e8 Moved startup Application info settings load out of Application 2015-02-02 17:19:54 -08:00
Stephen Birarda
ef82b90b89 add back the Application getter in ApplicationOverlay 2015-02-02 17:19:33 -08:00
Stephen Birarda
67c21be5dc remove old audioIO connections for bandwidth 2015-02-02 17:17:22 -08:00
Atlante45
9abdb41764 Rearrange settings classes in correct files 2015-02-02 17:17:19 -08:00
Stephen Birarda
c904a62e64 repairs for defines in GVRMainWindow 2015-02-02 17:15:24 -08:00
Stephen Birarda
28d710877c remove application calls from audio-client 2015-02-02 17:13:08 -08:00