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

28935 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
7b11d02eb2 Default Throttle FPS to disabled 2015-07-18 14:18:08 -07:00
David Rowe
d0489bf2a0 Add menu item, Developer > Render > Throttle FPS If Not Focus 2015-07-18 14:18:06 -07:00
Philip Rosedale
66d61dc587 Add lifetime so that abandoned birds eventually die 2015-07-18 13:34:14 -07:00
Bradley Austin Davis
5e0a0409bf Removing setupWorldLight from viewstateinterface 2015-07-18 12:16:51 -07:00
Brad Davis
b7fdfd8663 Working on lighting 2015-07-18 10:55:53 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
640171d5bd Restore AccountManager setup 2015-07-17 18:22:35 -07:00
Atlante45
1c965736e8 Remove merge error 2015-07-17 18:15:11 -07:00
Atlante45
052c3c987b Fix some more smart pointer 2015-07-17 18:10:34 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Brad Davis
084a098420 Merge pull request #5362 from ZappoMan/removeNakeGL 
Tweak the overlay rendering
 2015-07-17 17:53:46 -07:00
Sam Gateau
a0590182ad Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-17 17:44:54 -07:00
ZappoMan
98c078d995 move audio scope to the back 2015-07-17 17:44:29 -07:00
Sam Gateau
96e18af77b trying to remove the naked gl calls aroiund the rearViewMirror 2015-07-17 17:44:25 -07:00
ZappoMan
ecab2538d7 quick hack to fix overlay ordering 2015-07-17 17:27:15 -07:00
Anthony J. Thibault
01c740f415 cleaning up plugin architecture, fixed hand controllers 2015-07-17 17:19:49 -07:00
ZappoMan
816fd41624 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-07-17 17:10:52 -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
ZappoMan
9c52f28ff4 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-07-17 17:05:13 -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
Stephen Birarda
4661bd0075 resolve conflicts on merge with clement/protocol 2015-07-17 16:58:57 -07:00
Atlante45
c6e471256d Fix atomic construction 2015-07-17 16:55:45 -07:00
Stephen Birarda
f8c832e50b resolve conflicts on merge with upstream master 2015-07-17 16:48:46 -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
Stephen Birarda
9794770815 put back correct include for memcpy 2015-07-17 16:38:20 -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
Stephen Birarda
6419e49f4b call QIODevice constructor from Packet copy 2015-07-17 16:35:26 -07:00
Ryan Huffman
5ae1af0d62 Update users.js to persist isMinimized value 2015-07-17 16:33:24 -07:00
ZappoMan
695470b1c1 fix audio scope 2015-07-17 16:30:10 -07:00
Stephen Birarda
c846efb203 fix type in Packet constructor 2015-07-17 16:24:25 -07:00
Stephen Birarda
1a1c2d6bbe prepend module to QIODevice include 2015-07-17 16:20:53 -07:00
Stephen Birarda
30ee80313e add memory include for PacketList 2015-07-17 16:18:58 -07:00
Stephen Birarda
487f9dc45d add atomic include for NetworkPeer 2015-07-17 16:17:10 -07:00
ZappoMan
8692f51399 dead code cleanup 2015-07-17 16:15:02 -07:00
Stephen Birarda
1fd4a1f0c3 resolve conflicts on merge with upstream master 2015-07-17 16:07:45 -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
Stephen Birarda
54edc6f993 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-07-17 16:04:45 -07:00
Stephen Birarda
6ba89a1c99 Merge pull request #8 from birarda/atp 
final fixes for new networking API
 2015-07-17 16:03:16 -07:00
ZappoMan
c20c6e4b90 fix retina in an Austin approved manner 2015-07-17 16:01:32 -07:00
Stephen Birarda
331bb54144 remove unused variable 2015-07-17 15:59:39 -07:00
Stephen Birarda
39272652e5 fix seeks in InboundAudioStream 2015-07-17 15:59:24 -07:00
Atlante45
151481d5bf Remove seek 2015-07-17 15:58:58 -07:00
Stephen Birarda
35c8a60f3b seek to correct place for bulk avatar data 2015-07-17 15:57:52 -07:00
Stephen Birarda
b71678dfdb repair constructor that takes QByteArray in PacketList 2015-07-17 15:47:37 -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
Stephen Birarda
9c9c3d5120 remove extra debug in PacketList 2015-07-17 15:44:17 -07:00