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

5617 commits

Author SHA1 Message Date
Stephen Birarda
c2faf86201 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 15:24:37 -08:00
Stephen Birarda
2d10995d01 Merge pull request #2219 from ZappoMan/cruft_removal 
Fix Crash and Cruft Removal
 2014-03-06 15:01:31 -08:00
Stephen Birarda
721047234c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 14:53:57 -08:00
Stephen Birarda
5373cbbb9b Merge pull request #2228 from josecpujol/fix_2198 
Changed the up vector for computing the scale factor: it failed when
 2014-03-06 14:49:13 -08:00
Stephen Birarda
636d12510c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 14:45:02 -08:00
Stephen Birarda
816a631b05 tweak the oculus find module to take copied-in folders 2014-03-06 14:16:38 -08:00
Stephen Birarda
04807dd5d1 include cstdio for snprintf call in BandwidthDialog 2014-03-06 13:31:08 -08:00
Jose Carlos
8e81c4c467 Changed the up vector for computing the scale factor: it failed when 
there was a roll in the view
 2014-03-06 21:49:36 +01:00
Stephen Birarda
820dc7f45f include cstdio for sprintf call 2014-03-06 12:41:25 -08:00
Stephen Birarda
90d4bbee78 Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm 2014-03-06 09:16:22 -08:00
ZappoMan
d5c18a54fa removed dead code 2014-03-06 01:32:58 -08:00
ZappoMan
a887baf081 fix warning 2014-03-05 21:22:08 -08:00
ZappoMan
13985f8149 fix crash in Menu.removeSeparator() if the menu item doesn't exist or isn't a separator 2014-03-05 21:17:25 -08:00
ZappoMan
7a8d26247a remove piemenu 2014-03-05 21:03:32 -08:00
Andrzej Kapolka
82011905be Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-05 18:10:55 -08:00
Andrzej Kapolka
a7af3bc284 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-03-05 18:08:59 -08:00
Andrzej Kapolka
ad25455f86 Track hysteresis for next model separately, but just in case, don't use 
recursion to fall back on hysteresis value.  Closes #2209.
 2014-03-05 18:06:14 -08:00
ZappoMan
a54e401377 Merge branch 'master' of https://github.com/worklist/hifi into particle_collions_penetration 
Conflicts:
	libraries/script-engine/src/Vec3.cpp
 2014-03-05 18:04:57 -08:00
Philip Rosedale
c2a63c4206 Merge pull request #2190 from AndrewMeadows/shapes 
Collision Shapes
 2014-03-05 17:59:42 -08:00
Andrzej Kapolka
3930b3e824 Display names are great, but not in the shadow map. Closes #2208. 2014-03-05 17:44:08 -08:00
Andrzej Kapolka
78221c7de2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-05 17:13:00 -08:00
Stephen Birarda
ede32b5f1a resolve conflicts on merge with upstream master 2014-03-05 15:31:00 -08:00
ZappoMan
d89cb2bf5e added penetration support to particle collisions JS callbacks 2014-03-05 15:03:54 -08:00
Andrew Meadows
a1856ac18b fix bad transform math for placing shapes 2014-03-05 11:57:07 -08:00
Andrew Meadows
89f664c0ee fixing incorrect documentation comment 2014-03-05 11:52:47 -08:00
Andrew Meadows
2bc8e142b4 cruft removal 2014-03-05 11:51:42 -08:00
Stephen Birarda
395263ff3d add time to the interface logs - closes #2205 2014-03-05 09:55:06 -08:00
Andrew Meadows
7db5aaaf37 new collision pipeline for avatar shapes 2014-03-05 07:08:59 -08:00
Philip Rosedale
e4924cdca8 Merge pull request #2202 from birarda/authentication 
remove deprecated qt5 methods in CMakeList files
 2014-03-04 18:30:22 -08:00
ZappoMan
c031359a54 fix infinite reloading of missing script files 2014-03-04 16:20:17 -08:00
Stephen Birarda
b78e723253 fix a NaN in ViewFrustum and BuckyBalls 2014-03-04 15:53:05 -08:00
Stephen Birarda
161b8ad50b remove double inclusion of glm 2014-03-04 15:25:47 -08:00
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
Atlante45
f90062b38c Merge branch 'master' of https://github.com/highfidelity/hifi into freeglut_fix 2014-03-04 13:18:22 -08:00
Atlante45
3c99cf162d Fix was at the wrong spot 2014-03-04 13:17:19 -08:00
Andrzej Kapolka
1357aee01e Use mipmaps and trilinear filtering for models. Closes #2180. 2014-03-04 13:03:31 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
Andrew Meadows
57e217c7fb Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 12:10:12 -08:00
AndrewMeadows
ea0fe95baa Merge pull request #2191 from birarda/null-checks 
more null pointer cleanup
 2014-03-04 12:07:39 -08:00
ZappoMan
d5e7e98b5e Merge pull request #2192 from Atlante45/freeglut_fix 
fix for windows
 2014-03-04 11:51:14 -08:00
Andrew Meadows
d537b4118d Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 11:40:59 -08:00
Atlante45
9767846c91 fix for windows 2014-03-04 11:06:23 -08:00
Atlante45
894f85fcb5 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-04 10:49:26 -08:00
Atlante45
66b0590509 Review fixes 2014-03-04 10:48:53 -08:00
Stephen Birarda
f5aaad1f33 remove if checks in cases where delete handles null 2014-03-04 10:05:43 -08:00
Andrew Meadows
3d426a24f1 Fixing build warnings 2014-03-04 09:54:34 -08:00
Andrew Meadows
d0ac8eec74 removing unused variable 2014-03-04 09:54:12 -08:00
Andrew Meadows
7ba5bc71ea Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 
Conflicts:
	interface/src/renderer/FBXReader.cpp
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-03-04 09:01:24 -08:00
ZappoMan
1a5b0ee02e Merge pull request #2170 from birarda/cmake-quotes 
complete quoting of various cmake commands
 2014-03-04 09:00:26 -08:00
Atlante45
84f8e6ee19 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-03 17:55:30 -08:00