Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 11:20:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
29880 commits 69 branches 56 tags 1.2 GiB
Commit graph

29880 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zander Otavka
eab35d03d4 Improve vector operations in floatingUIExample.js. 2015-08-05 10:24:03 -07:00
Seth Alves
eb87023416 code review 2015-08-05 10:16:45 -07:00
Howard Stearns
5f895e8aff Merge pull request #5448 from PhilipRosedale/master 
test script to load test with lots of entities
 2015-08-05 10:08:03 -07:00
Howard Stearns
2f2b59b6b6 Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations 2015-08-05 10:05:05 -07:00
Philip Rosedale
f1a4e185cd Added lifetime and better notes, per PR 2015-08-05 10:04:59 -07:00
Zander Otavka
4965f1adda Fix a facingRotation issue for PanelAttachable. 2015-08-05 09:20:55 -07:00
Howard Stearns
6ea06ffc3c Merge pull request #5504 from sethalves/rig 
set-hand-position in rig
 2015-08-05 09:05:29 -07:00
Philip Rosedale
df60453344 Merge pull request #5462 from ctrlaltdavid/20574 
CR for 20574 - Use single file robot model as fallback for full avatar models
 2015-08-05 08:55:00 -07:00
Philip Rosedale
06710618d1 Merge pull request #5463 from ctrlaltdavid/20640 
CR for 20640 - Add DDE option to couple eyelids
 2015-08-05 08:47:28 -07:00
samcake
6783ec300a Merge pull request #5499 from jherico/homer 
CORE PROFILE: Fix star point smoothing... sort of
 2015-08-04 20:15:09 -07:00
samcake
a2a47bc0fc Merge pull request #5507 from jherico/lisa 
CORE PROFILE: Fix diagonal slashes in text
 2015-08-04 20:10:17 -07:00
Howard Stearns
a1f86cc7b8 Make MSVC happy. 2015-08-04 19:49:12 -07:00
Seth Alves
efe61a1520 Merge branch 'polyvox-render' of github.com:sethalves/hifi into polyvox 2015-08-04 17:54:10 -07:00
Seth Alves
80909b4531 work toward getting textures on polyvox entities 2015-08-04 17:53:47 -07:00
Seth Alves
56c0f9c814 work toward getting textures on polyvox entities 2015-08-04 17:37:15 -07:00
Bradley Austin Davis
fc5ec22810 Fix diagonal slashes in text 2015-08-04 17:28:42 -07:00
Howard Stearns
731bcba956 Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations 2015-08-04 17:27:23 -07:00
Zander Otavka
90bfce25e5 Add anchorPosition as a field for FloatingUIPanel. 2015-08-04 17:10:56 -07:00
Zander Otavka
cb5b5fcfc4 Increase right click move threshold. 2015-08-04 17:10:36 -07:00
Seth Alves
419caccd8e unmangle merge 2015-08-04 17:06:17 -07:00
Howard Stearns
61198a658c Smooth fading of animations in and out. 
Also, turn on the secret rig animations from Javascript with MyAvatar.setEnableRigAnimations(true). (persists)
 2015-08-04 17:04:15 -07:00
Brad Davis
8dfe129da3 Merge pull request #5505 from samcake/punk 
CORE PROFILE: Fixing the rear view mirror rendering problems
 2015-08-04 17:02:31 -07:00
Seth Alves
78091fd983 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-render 2015-08-04 16:56:45 -07:00
Seth Alves
fd1d4ed896 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-04 16:51:29 -07:00
Sam Gateau
730ad2da2f removing dead code 2015-08-04 16:37:01 -07:00
Sam Gateau
d2360d1406 Merge branch 'core' of https://github.com/highfidelity/hifi into punk 2015-08-04 16:31:33 -07:00
Sam Gateau
fc0ee28b84 FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD 2015-08-04 16:31:20 -07:00
Bradley Austin Davis
2221c839c3 Fix star point smoothing... sort of 2015-08-04 16:29:07 -07:00
samcake
59b69be251 Merge pull request #5501 from jherico/lisa 
CORE PROFILE: Working on HMD crash on mac
 2015-08-04 16:27:37 -07:00
Bradley Austin Davis
4f759ee46a Merge remote-tracking branch 'upstream/master' into core 2015-08-04 16:26:16 -07:00
Seth Alves
c3fc1d5391 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-08-04 16:13:58 -07:00
Seth Alves
9af6b00403 Merge pull request #5500 from SamGondelman/controlBug 
Possible fix for infrequent inability to move on Windows startup
 2015-08-04 16:13:47 -07:00
Seth Alves
9171033f21 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-08-04 16:06:38 -07:00
Seth Alves
b318c1122c Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-04 16:00:27 -07:00
Seth Alves
fcec6cb1f0 Merge pull request #5464 from nnesse/master 
Remove redundant code in getOrCreateChildElementAt()
 2015-08-04 15:54:14 -07:00
Seth Alves
a218f0de83 Merge pull request #5483 from AndrewMeadows/caesium 
remove legacy shapes and friends
 2015-08-04 15:40:20 -07:00
bwent
b9364a47a1 Debug null QUuid being stored in conenctionTokenHash 2015-08-04 15:31:26 -07:00
Bradley Austin Davis
241ee00ca5 Working on HMD crash on mac 2015-08-04 15:18:01 -07:00
Eric Levin
f506e58687 Merge pull request #5490 from howard-stearns/restart-animations-at-specified-parameters 
restart animations at specified parameters
 2015-08-04 15:09:11 -07:00
Eric Levin
4693100026 Merge pull request #5491 from howard-stearns/basic-rig-state-with-fight-club-defaults 
basic fight club animations
 2015-08-04 15:09:03 -07:00
Zander Otavka
a21fa94f14 Fix error in floatingUIExample.js. 
Script would crash if the user left clicked somewhere not on an overlay.
 2015-08-04 15:06:12 -07:00
Sam Gateau
79e4cdd514 Merge branch 'core' of https://github.com/highfidelity/hifi into punk 2015-08-04 14:55:00 -07:00
samcake
a2536c75f4 Merge pull request #5498 from jherico/lisa 
CORE PROFILE: Fix bug in lightmap and specular map fragment shaders
 2015-08-04 14:54:09 -07:00
SamGondelman
52be44d621 uninitialized value 2015-08-04 14:50:38 -07:00
Brad Davis
6d15a274a6 Merge pull request #5496 from samcake/daft 
CORE PROFILE: Removing the line width completely from gpu::lib
 2015-08-04 14:42:00 -07:00
Sam Gateau
10fcce7064 FIx again the issue of the COlor 32 format to NUINT8 2015-08-04 14:38:43 -07:00
Bradley Austin Davis
c454bc96a0 Fix bug in lightmap and specular map fragment shaders 2015-08-04 14:36:42 -07:00
Seth Alves
45643a3aad try, try again 2015-08-04 14:36:16 -07:00
Sam Gateau
0d727934bb Merge branch 'core' of https://github.com/highfidelity/hifi into punk 2015-08-04 14:27:30 -07:00
samcake
3c55e8b5e1 Merge pull request #5497 from jherico/homer 
Fix white rendering of many primitives
 2015-08-04 14:26:57 -07:00