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

2125 commits

Author SHA1 Message Date
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
Stephen Birarda
19c5f0b67c resolve conflicts on merge with upstream/master 2015-07-08 22:54:36 -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
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
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
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
383a2c3d63 another attempt 2015-06-18 09:43:39 -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