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

27868 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
1a9f6e12a5 something not compiling but just before merge with upstream 2015-07-20 12:20:04 -07:00
Sam Gateau
a0590182ad Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-17 17:44:54 -07:00
Sam Gateau
96e18af77b trying to remove the naked gl calls aroiund the rearViewMirror 2015-07-17 17:44:25 -07:00
Brad Hefta-Gaub
2423d25839 Merge pull request #5355 from ctrlaltdavid/20620 
QA for #20620 - Make renderGrid handle changing position and dimensions
 2015-07-17 17:10:43 -07:00
Brad Davis
c822e66317 Merge pull request #5346 from samcake/daft 
Adding the scissor rect in the Batch and a way to enable the scissor during clear command
 2015-07-17 17:04:42 -07:00
Brad Davis
fd76a198ef Merge pull request #5352 from ZappoMan/removeNakeGL 
Remove naked gl from ApplicationOverlay and ApplicationCompositor
 2015-07-17 17:03:38 -07:00
ZappoMan
26e8090ec1 Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL 2015-07-17 16:48:42 -07:00
Brad Hefta-Gaub
3ea348b73b Merge pull request #5349 from jherico/marge 
Working on text rendering overlays
 2015-07-17 16:47:48 -07:00
ZappoMan
eb989fd725 fix the backround colors for text overlays, pending austins PR to really fix them 2015-07-17 16:38:05 -07:00
ZappoMan
695470b1c1 fix audio scope 2015-07-17 16:30:10 -07:00
ZappoMan
8692f51399 dead code cleanup 2015-07-17 16:15:02 -07:00
Howard Stearns
7accc53c0e Merge pull request #5353 from AndrewMeadows/beryllium 
cleanup of EntityItem ctors and friends
 2015-07-17 18:07:35 -05:00
ZappoMan
c20c6e4b90 fix retina in an Austin approved manner 2015-07-17 16:01:32 -07:00
Sam Gateau
8a269b6972 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-17 15:47:27 -07:00
Sam Gateau
9eff19b0f7 add th emissing function 2015-07-17 15:47:17 -07:00
ZappoMan
03a44a1c80 fix retina 2015-07-17 15:45:42 -07:00
ZappoMan
ccd2f98a76 one more try 2015-07-17 15:28:25 -07:00
Andrew Meadows
32b1fe0918 proper fix for incorrect render of scaled entities 2015-07-17 15:21:02 -07:00
Brad Hefta-Gaub
2df75f8bff Merge pull request #5337 from bwent/audioStatsDialog 
Added a dialog box to display Audio Network Statistics
 2015-07-17 14:45:51 -07:00
Bradley Austin Davis
3bfa8aae0b Removing debug output 2015-07-17 14:34:24 -07:00
Brad Davis
914b47069b Working on line height 2015-07-17 14:33:32 -07:00
Bradley Austin Davis
24643ca282 Working on line spacing 2015-07-17 14:19:39 -07:00
Brad Davis
6f998e5d28 Working on line spacing on mac 2015-07-17 13:32:31 -07:00
ZappoMan
4dadf60724 some tweaks from Sam 2015-07-17 12:50:20 -07:00
Bradley Austin Davis
c5e0298f8d Working on mac sizing 2015-07-17 12:22:38 -07:00
Andrew Meadows
1c7afbda04 workaround for bad sphere radius 2015-07-17 12:14:53 -07:00
Andrew Meadows
f09b3eb736 set creation time when loading unknown timestamp 2015-07-17 12:14:07 -07:00
ZappoMan
33464dfd6c cleanup dead code 2015-07-17 11:35:42 -07:00
Howard Stearns
c9658b2c13 Merge pull request #5354 from PhilipRosedale/master 
Sample script flockOfBirds.js with sounds and flocking behavior
 2015-07-17 13:15:08 -05:00
bwent
b22fd3f4a0 fixed lagging issues 2015-07-17 10:58:30 -07:00
Philip Rosedale
ee435d9732 remove comment 2015-07-17 09:43:33 -07:00
Philip Rosedale
689b0e2571 Improve to run correctly on startup as AC 2015-07-17 09:41:48 -07:00
ZappoMan
efa2001325 Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL 2015-07-17 09:25:37 -07:00
Philip Rosedale
db219905f3 re-use audio injectors, don't check if isPlaying immediately after starting play out 2015-07-17 00:30:31 -07:00
Philip Rosedale
5c29eb97ef remove debug 2015-07-16 23:32:40 -07:00
Philip Rosedale
cf9365e616 Add new sample script with flocking 2015-07-16 22:46:41 -07:00
David Rowe
c46533d9a6 Make renderGrid handle changing position and dimensions 
So that audio scope grid moves when Interface window is resized.
 2015-07-16 21:05:14 -07:00
Andrew Meadows
2441be21e2 restore order of setting properties 2015-07-16 20:58:34 -07:00
Andrew Meadows
18d0cb5158 cleanup of EntityItem ctors and friends 2015-07-16 17:48:28 -07:00
Brad Davis
7e32bfb85e Fixing mac/linux build 2015-07-16 17:35:05 -07:00
Brad Davis
e6e9f017c0 Fixing test code 2015-07-16 17:23:25 -07:00
ZappoMan
410e0a99ad hacking on more naked GL 2015-07-16 16:45:58 -07:00
Brad Davis
ae10d58142 Fixing font class 2015-07-16 16:42:29 -07:00
ZappoMan
069620b2d9 hacking on more naked GL 2015-07-16 16:36:48 -07:00
ZappoMan
09430b6596 hacking on more naked GL 2015-07-16 16:27:41 -07:00
ZappoMan
398075e45a hacking on more naked GL 2015-07-16 16:26:28 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
Sam Gateau
50a521e1f2 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-16 12:38:47 -07:00
Sam Gateau
4ca333efe1 Adding the scissor rect in the Batch and a way to enable the scissor test locally for clear commands 2015-07-16 12:38:11 -07:00
bwent
854a098180 keep track of channel id's within addChannel function, pass in when updating 2015-07-16 12:28:43 -07:00