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

10110 commits

Author SHA1 Message Date
samcake
1f13106f51 FIxed the issue on mac due to the abs function not correctly executing 2015-07-09 15:05:03 -07:00
Sam Gateau
2968286779 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-09 11:19:45 -07:00
Philip Rosedale
542a5f100a Merge pull request #5280 from BingShearer/airhockey 
Air Hockey UI Fix
 2015-07-09 10:04:21 -07:00
Sam Gateau
110b009aa4 Less magic in this world 2015-07-09 09:55:25 -07:00
Sam Gateau
8f4a108441 Dead code and disable debug info 2015-07-09 09:37:35 -07:00
Sam Gateau
fb37af3e04 Removing dead code 2015-07-09 09:25:07 -07:00
Sam Gateau
e901d5cad0 Uncommented a block left behind... 2015-07-09 09:21:53 -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
Sam Gateau
6b229d8d2d Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-09 03:45:55 -07:00
Sam Gateau
8314fe8c7f FInally getting a nice spot light volume working for all angles 2015-07-09 03:45:19 -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 Hefta-Gaub
02c3b63f45 Merge pull request #5282 from jherico/entity_parsing 
Working on fixing entity item parsing
 2015-07-08 21:02:23 -07:00
Brad Davis
b173ac397c Merge pull request #5278 from samcake/yellow 
Adding more NSight instrumentation
 2015-07-08 20:28:18 -07:00
Brad Davis
f2beb79d23 Updating buffer parser to use new heapless API 2015-07-08 18:54:38 -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
Bing Shearer
25a1108b61 Fixed spelling error 2015-07-08 16:24:23 -07:00
ZappoMan
6a9344a3f6 fix bug in old version of decode 2015-07-08 15:14:24 -07:00
Sam Gateau
4c44eb63da Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-08 14:25:41 -07:00
Sam Gateau
f992e875b4 Adding intrsumentation for nsight and hiding the nsight specific code in cpp 2015-07-08 14:25:13 -07:00
Andrew Meadows
58c32dbf20 remove whitespace from end of lines 2015-07-08 11:30:04 -07:00
Andrew Meadows
a0a1b01ea9 coalesce dupe action data members: _id and _type 2015-07-07 17:50:08 -07:00
Andrew Meadows
e9df8cacc7 make some arguments const, cleanup some #includes 2015-07-07 17:50:08 -07:00
Andrew Meadows
77bd7b2821 some ObjectAction methods should be const 2015-07-07 17:50:08 -07:00
Andrew Meadows
f1b505d46b Merge pull request #5266 from howard-stearns/expose-avatar-collisions-to-scripts 
Expose avatar collisions to scripts, ...
 2015-07-07 16:12:18 -07:00
ZappoMan
20a9227070 Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats 2015-07-07 13:16:42 -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
samcake
5557dc4da2 clean and release the new deferredLIghtingEffect 2015-07-07 10:00:05 -07:00
ZappoMan
a59fd44014 quiet some log spam 2015-07-07 09:04:20 -07:00
Atlante45
687f9dda4a Restore old offset behaviors 2015-07-06 18:21:17 -07:00
Atlante45
541d9ae431 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard 2015-07-06 18:05:43 -07:00
Brad Davis
bd938d5f4c Merge pull request #5263 from ZappoMan/inBoundStats 
Additional inbound entity stats
 2015-07-06 17:12:19 -07:00
ZappoMan
05f28064bf add stats for PPS for inbound from network into OctreePacketProcessor and processing out of OctreePacketProcessor 2015-07-06 16:03:42 -07:00
samcake
c090bd0bd7 Merge branch 'yellow' of https://github.com/samcake/hifi into daft 2015-07-06 15:46:21 -07:00
samcake
9649fe45e4 fix a bad paintRainbow function in the shader... 2015-07-06 15:45:26 -07:00
Sam Gateau
fe633cd545 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-06 15:04:02 -07:00
samcake
a2f6693bd7 getting the deferred lighting to work 2015-07-06 14:40:10 -07:00
Sam Gateau
4d48b98364 For a fistfull of magic numbers 2015-07-06 14:22:09 -07:00
Sam Gateau
95f5b14d45 CLenaing the interface of Item::Status to be more explicit and removing magic numbers 2015-07-06 12:47:35 -07:00
Sam Gateau
e63be58251 CLenaing the interface of Item::Status to be more explicit 2015-07-06 12:23:57 -07:00
Sam Gateau
2bbffff22f Fixing typos 2015-07-06 10:22:25 -07:00
samcake
76e661f88d Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-05 12:08:56 -07:00
ZappoMan
c4a5160b89 CR feedback 2015-07-04 19:13:35 -07:00
Atlante45
c61bf34200 Use depth bias to avoid z-fighting on text entities 2015-07-04 18:35:00 -07:00
Atlante45
0093403bba Add depth bias option to simple programs 
Simple programs are now lazily generated and stored in a hash
 2015-07-04 18:33:03 -07:00