Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 20:46:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30784 commits 25 branches 0 tags 1.1 GiB
Commit graph

2151 commits

Author SHA1 Message Date
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
ZappoMan
d1e511efcb more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl 2015-07-15 15:52:12 -07:00
samcake
9df26c8488 removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs 2015-07-15 00:24:43 -07:00
Anthony J. Thibault
dbc18ce51f merge with plugins 2015-07-14 12:30:47 -07:00
Stephen Birarda
821c16cbc4 resolve conflicts on merge with uptream/master 2015-07-14 09:52:20 -07:00
ericrius1
0ce6737b34 merged and normals flipping 2015-07-13 09:43:15 -07:00
Seth Alves
c17c9f1818 quiet compiler 2015-07-12 10:29:43 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
Brad Davis
c1b72db18d Still trying to get jenkins builds to work 2015-07-10 16:00:51 -07:00
Brad Davis
2ce8dba819 Removing heap allocation from property flag parsing, adding some manual tests 2015-07-10 15:08:10 -07:00
Stephen Birarda
1b4e333c49 Merge pull request #3 from birarda/atp 
initial networking API changes for new protocol
 2015-07-09 16:51:37 -04:00
Stephen Birarda
2417981c9d resolve conflicts on merge with clement/protocol 2015-07-09 13:27:59 -07:00
Stephen Birarda
893e1864fd cleanup _newestEntryAtIndex calc in RBH insert 2015-07-09 13:22:41 -07:00
Atlante45
c0b8f83ca0 Better ring index compute 2015-07-09 13:22:09 -07:00
Stephen Birarda
14b73ae00f remove qtimespan that isn't used anymore 2015-07-09 12:45:32 -07:00
Brad Hefta-Gaub
489a8b4b3d Merge pull request #5285 from jherico/homer 
Move log file writing to a separate thread
 2015-07-09 12:22:13 -07:00
Brad Hefta-Gaub
fb07956689 Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix 
fix for mirror rendering on windows
 2015-07-09 08:38:55 -07:00
Stephen Birarda
19c5f0b67c resolve conflicts on merge with upstream/master 2015-07-08 22:54:36 -07:00
Brad Davis
63dfd570f1 Adding priority support to GenericThread 2015-07-08 22:54:31 -07:00
Brad Davis
08d1364f81 Move file log persistence to a separate thread 2015-07-08 22:35:23 -07:00
Anthony J. Thibault
1be0e7ebc3 fix for mirror rendering on windows 
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
  I think this was working on Mac due to the different code paths in
  GLBackendTransform::updateTransform for core vs legacy gl profile.
 2015-07-08 21:33:27 -07:00
Brad Davis
f2beb79d23 Updating buffer parser to use new heapless API 2015-07-08 18:54:38 -07:00
Stephen Birarda
da3502eb6c resolve conflicts on merge with upstream/master 2015-07-08 18:41:48 -07:00
Brad Davis
49a14e3446 Merge remote-tracking branch 'upstream/master' into entity_parsing 2015-07-08 18:37:41 -07:00
Brad Davis
625cc86f83 Merge pull request #5283 from ZappoMan/optimizeByteCountCoded 
Optimize ByteCountCoded<> to not do extra heap allocations
 2015-07-08 18:35:02 -07:00
ZappoMan
7790e35d24 added bytes consumed result to decode, and exit early after bytes consumed 2015-07-08 18:19:12 -07:00
Brad Davis
600e9cbf52 Fixing template specialization compilation error on gcc/clang 2015-07-08 18:17:03 -07:00
ZappoMan
c0cdf3256c comment and dead code 2015-07-08 17:34:36 -07:00
ZappoMan
e885ac1821 improved performance of ByteCountCoding<> decode 2015-07-08 17:32:51 -07:00
Brad Davis
98e0688e98 Reducing heap allocation in network packet parsing 2015-07-08 17:21:38 -07:00
ZappoMan
6a9344a3f6 fix bug in old version of decode 2015-07-08 15:14:24 -07:00
Atlante45
6bf05fbf1f Pointer fixes 2015-07-08 10:50:51 -07:00
Atlante45
737d85c597 Compile fixes 2015-07-07 18:22:06 -07:00
Andrew Meadows
e9df8cacc7 make some arguments const, cleanup some #includes 2015-07-07 17:50:08 -07:00
Atlante45
fa43c62722 RingBufferHistory handles unique_ptr 2015-07-07 16:45:43 -07:00
Howard Stearns
1c2972bd7c Expose avatar collisions to scripts, and include velocityChange in exposed collision data. 2015-07-07 11:49:55 -07:00
Anthony J. Thibault
5293effc2e more work in progress vive room tracking 
Found and disabled torso twist
use an old copy of the hmd pose before physics, and the most up to date
one after physics.
 2015-07-07 00:12:48 -07:00
Anthony J. Thibault
834b75f4c4 work in progress room scale tracking work. 
sensor to world matrix stored in MyAvatar
override setPosition and setOrientation to move sensor to world matrix.
 2015-07-06 18:25:42 -07:00
Brad Hefta-Gaub
2a03f62bf2 Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership 
Actions over wire and improved simulation ownership
 2015-07-02 14:57:27 -07:00
ericrius1
ad97b28734 fixed merge conflicts 2015-07-02 11:01:40 -07:00
ericrius1
feeba2a029 testing for serialization 2015-07-01 23:03:03 -07:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Brad Davis
59027959b8 CR comments and fixing the average calculation 2015-07-01 16:30:42 -07:00
Clément Brisset
93d51717ce Merge pull request #5201 from ctrlaltdavid/20590 
QA for #20590 - Delete Interface.ini.lock file at start-up if it exists
 2015-07-01 13:54:02 -07:00
Seth Alves
5e2f7204b4 responses to code review 2015-07-01 10:29:42 -07:00
Seth Alves
6e7973f5b9 coding-standard / code-review 2015-06-30 19:28:22 -07:00
ericrius1
ff77c3e0d8 added stroke width entity 2015-06-30 18:38:40 -07:00
Seth Alves
1d122060a6 merge andrew's sim-ownership branch 2015-06-29 09:50:38 -07:00
Seth Alves
0970f010a4 provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are 2015-06-27 13:31:00 -07:00
Andrew Meadows
b6d5adaef8 move global into function that uses it 2015-06-26 21:57:04 -07:00
Andrew Meadows
c87e7c99ce bid for ownership on script-change phys properties 2015-06-26 21:57:04 -07:00
Seth Alves
0f3ac976c3 don't try to convert a vec3 containing NaN to a script value 2015-06-26 17:53:28 -07:00
Stephen Birarda
c6df573933 fix some OS X warnings, add description to tooltip 2015-06-26 10:50:31 -07:00
Atlante45
85b2771c4a Extend Extents 2015-06-24 15:44:48 -07:00
David Rowe
33b48947a5 Delete Interface.ini.lock file at start-up if it exists 
Otherwise Interface freezes.
 2015-06-23 17:36:19 -07:00
Seth Alves
4bf4e9f5da Merge pull request #5164 from ericrius1/lineBounds 
Line bounds
 2015-06-23 10:47:38 -07:00
ericrius1
0e177a3e31 deleted unnessary line break 2015-06-18 18:23:09 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-18 18:17:59 -07:00
ericrius1
7293330ced fixed indentation and lines delete when user exits to help with large model.svo/json file size 2015-06-18 18:17:02 -07:00
ericrius1
6a5deaaef1 returning true from set line points 2015-06-18 16:54:39 -07:00
ericrius1
2b4146125f adding logic to check points of line are inside bounds 2015-06-18 16:27:06 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Brad Hefta-Gaub
b008b810e1 Merge pull request #5145 from Atlante45/text 
Bring back display names
 2015-06-18 11:25:45 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
ZappoMan
673e1ee0cc first cut and removing openGl dependency in shared 2015-06-18 09:30:34 -07:00
Atlante45
1cab853f18 Better guard Transform scale 2015-06-18 15:23:50 +02:00
Atlante45
254f05072f Fix inverted if 2015-06-18 15:23:49 +02:00
Brad Davis
d9452cfd2e Merge branch 'gpu-error-tweak' into overlay 2015-06-18 00:54:48 -07:00
Brad Davis
a83a4fb0a1 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-17 19:53:31 -07:00
Seth Alves
eb89835d42 Merge branch 'master' of github.com:highfidelity/hifi into fix-line-data-handling 2015-06-17 18:35:00 -07:00
Seth Alves
8735fa1eac have variantMapToScriptValue handle lists. 2015-06-17 18:33:43 -07:00
Brad Hefta-Gaub
4501fb1d61 Merge pull request #5073 from jherico/ovr6 
Support Oculus SDK version 0.6 on windows only
 2015-06-17 18:17:34 -07:00
Bradley Austin Davis
4633cabcec Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 17:07:43 -07:00
Brad Davis
ae1c9603b9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
Seth Alves
68df6b662d fix ifdefs around asserts 2015-06-17 15:03:09 -07:00
Seth Alves
44bb220130 fix debug build 2015-06-17 14:54:13 -07:00
Seth Alves
9a51a4c5b1 fix debug build 2015-06-17 14:48:37 -07:00
ZappoMan
58ee5217e3 fix some warnings 2015-06-17 14:08:02 -07:00
Bradley Austin Davis
2172445db7 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 12:56:41 -07:00
Brad Davis
5ded9e7eb9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 10:50:01 -07:00
Sam Gateau
5c547037f2 Migrating the overaly 3d rendering in their own job and their own shader 2015-06-17 15:54:20 +02:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -07:00
Brad Davis
ba13b7820c Working on overlay refactor 2015-06-16 09:58:03 -07:00
Andrew Meadows
0e12cdc39e woops, forgot to include this in last commit 2015-06-10 12:41:15 -07:00
Brad Davis
5680d58a19 Removing oglplus requirement for linux and mac 2015-06-09 03:09:10 -07:00
Brad Davis
6147844f93 Merge branch 'master' into ovr6 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.h
 2015-06-09 00:44:06 -07:00
ZappoMan
24c8e7d0e6 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 13:50:50 -07:00
Stephen Birarda
666830c04d add a sound once first AM packet received 2015-06-08 11:30:12 -07:00
Bradley Austin Davis
5a52a389be Working on SDK 0.6 2015-06-07 23:23:21 -07:00
Bradley Austin Davis
b56fbd4744 Working on SDK 0.6 2015-06-07 13:56:06 -07:00
Brad Davis
f614268667 Moving windows to SDK 0.6 
Working on SDK 0.6 for windows

Working on SDK 0.6 for windows
 2015-06-07 01:40:44 -07:00
ZappoMan
f8a2fff5a7 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 11:06:10 -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
ZappoMan
807cc3db24 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 09:37:39 -07:00
Clément Brisset
f19c0d8eec Some renaming for windows compiler 2015-06-05 13:23:58 +01:00
Atlante45
93b44e6846 Collect stats on translucent/opaque mesh parts 2015-06-04 18:46:47 +02:00
Atlante45
a4340b17e9 Remove deprecated render stats 2015-06-04 14:47:04 +02:00
Andrew Meadows
ec0b4a956a move collision group consts to shared lib 2015-06-03 14:13:51 -07:00
Andrew Meadows
a989998816 fix typo in comment 2015-06-03 14:13:30 -07:00