Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 04:13:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28647 commits 71 branches 56 tags 1.2 GiB
Commit graph

28647 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
796dfee687 udt namespace fixes and NLPacket operator fixes 2015-07-20 17:28:04 -07:00
Stephen Birarda
9556fecbe2 initial changes to make _nodeSocket a udt::Socket 2015-07-20 17:10:22 -07:00
samcake
e63d122f2a Merge pull request #5375 from birarda/protocol 
repairs to early return for sendNackPackets
 2015-07-20 16:21:55 -07:00
Stephen Birarda
9fb8b55359 repairs to early return for sendNackPackets 2015-07-20 16:10:11 -07:00
Clément Brisset
ac153699b1 Merge pull request #5372 from birarda/protocol 
fix for reading of type from SVO files
 2015-07-20 15:27:58 -07:00
Stephen Birarda
74193b3dac bump packet versions after fix 2015-07-20 15:20:14 -07:00
Stephen Birarda
0dc62dd858 Merge branch 'protocol' of https://github.com/Atlante45/hifi into protocol 2015-07-20 15:14:40 -07:00
Atlante45
bca8d8181d fix entity data packet type value 2015-07-20 15:14:16 -07:00
Stephen Birarda
5f592df610 don't seek in Packet before open 2015-07-20 15:14:07 -07:00
Andrew Meadows
7578a70c4c Merge pull request #5359 from birarda/protocol 
Network Protocol Refactor
 2015-07-20 14:30:58 -07:00
Brad Hefta-Gaub
ab67a3c5af Merge pull request #5370 from jherico/homer 
Remove ambient occlusion and wireframe mode for naked GL violations
 2015-07-20 13:49:51 -07:00
Brad Davis
488a449cb1 Merge branch 'master' into homer 2015-07-20 13:34:21 -07:00
Stephen Birarda
462ff97722 remove FlowLayout.cpp that was accidentally kept 2015-07-20 13:06:31 -07:00
Stephen Birarda
0177513285 resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
Brad Hefta-Gaub
c41e20b90f Merge pull request #5366 from jherico/marge 
Naked GL removal work
 2015-07-20 12:12:22 -07:00
Brad Davis
3d09e772f9 Merge branch 'marge' into homer 2015-07-20 12:09:51 -07:00
Brad Davis
23b058e4eb Removing starfield tilt and reducing grid alpha 2015-07-20 11:40:12 -07:00
Brad Davis
dcaaeec593 Removing AO effect (temporarily) and wireframe mode 2015-07-20 10:55:11 -07:00
Seth Alves
7c5286e804 Merge pull request #5356 from howard-stearns/isPlaying 
Make sure that Audio isPlaying is correct
 2015-07-20 10:51:58 -07:00
Brad Davis
cd677ccb18 Removing animation from star grid 2015-07-20 10:18:14 -07:00
Brad Davis
de92e66635 Removing shadows code 2015-07-20 09:59:22 -07:00
Brad Davis
d4e637c5b8 Removing superfluous lighting and naked GL in mirror 2015-07-20 09:36:05 -07:00
Stephen Birarda
54f618a502 Merge pull request #5361 from huffman/users-setting 
Update users.js to persist isMinimized value
 2015-07-20 09:01:31 -07:00
Stephen Birarda
6b11495a20 resolve conflicts on merge with upstream master 2015-07-20 08:51:48 -07:00
Brad Davis
5159452335 Fixing invalid vector usage and strange picking crash 2015-07-19 23:03:46 -07:00
Brad Davis
4c3cfe1e82 Starfield jazz hands 2015-07-19 20:53:50 -07:00
Brad Davis
81543d9185 Removing unneeded undef 2015-07-19 19:06:21 -07:00
samcake
9ee93eb4d7 Merge pull request #5358 from bwent/keyLightDirectionFix 
fix keyLightDirection to display in degrees in edit.js UI
 2015-07-19 14:25:59 -07:00
Brad Davis
f13152b2b4 Fixing reference to PI/2 2015-07-18 23:04:16 -07:00
Brad Davis
0da8b27fcf Removing unused files 2015-07-18 22:53:43 -07:00
Brad Davis
5b494c23fd More header cleanup 2015-07-18 22:38:26 -07:00
Brad Davis
35f7307f30 More header cleanup 2015-07-18 22:15:50 -07:00
Brad Davis
0056208565 Another whack at GL headers 2015-07-18 17:04:44 -07:00
Brad Davis
c446bb307d Adding convenience return *this to many transform methods 2015-07-18 16:56:32 -07:00
Brad Davis
e4f6586c3c Working on star rendering, removal of naked GL 2015-07-18 16:40:54 -07:00
Philip Rosedale
32a30c4963 Merge pull request #5344 from ericrius1/newSword 
updated sword script so users can grab sword with hydra to adjust rel…
 2015-07-18 15:45:43 -07:00
Philip Rosedale
61c2b172d4 Merge pull request #5357 from ctrlaltdavid/scriptable-muting 
Mute / un-mute face tracking when menu item is changed from script
 2015-07-18 15:45:01 -07:00
Philip Rosedale
916069ccc5 Merge pull request #5364 from ctrlaltdavid/20625 
Make FPS throttling optional
 2015-07-18 15:43:01 -07:00
David Rowe
47fdbedfb2 Fix FPS throttle default 2015-07-18 15:22:47 -07:00
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
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
Brad Davis
084a098420 Merge pull request #5362 from ZappoMan/removeNakeGL 
Tweak the overlay rendering
 2015-07-17 17:53:46 -07:00
ZappoMan
98c078d995 move audio scope to the back 2015-07-17 17:44:29 -07:00
ZappoMan
ecab2538d7 quick hack to fix overlay ordering 2015-07-17 17:27:15 -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