Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13417 commits 71 branches 56 tags 1.2 GiB
Commit graph

13417 commits

This branch
This branch
All branches
Author SHA1 Message Date
barnold1953
06a9ac22e7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-30 09:26:07 -07:00
Philip Rosedale
169e7d61fd Merge pull request #2954 from ctrlaltdavid/19715 
Code Review for Job #19715
 2014-05-29 20:03:24 -07:00
Andrzej Kapolka
b93b009cd8 Merge pull request #2953 from PhilipRosedale/master 
Fixes having large yaw movements get head and body out of alignment with oculus
 2014-05-29 19:00:37 -07:00
AndrewMeadows
5b74829318 Merge pull request #2955 from ey6es/cascade 
Basic cascaded shadow maps for increased shadow draw distance.
 2014-05-29 18:57:44 -07:00
Andrzej Kapolka
f42199b3e1 Merge pull request #2952 from Atlante45/click_drag_attach 
Click drag attach!
 2014-05-29 18:55:33 -07:00
AndrewMeadows
eed2cd28ef Merge pull request #2956 from ZappoMan/perfstats 
Fix Ray Intersection bug that was causing low FPS... also added more performance debugging
 2014-05-29 18:48:38 -07:00
ZappoMan
6a57e662ac removed extra line 2014-05-29 18:34:11 -07:00
ZappoMan
e59e253727 fix ray intersection performance 2014-05-29 18:32:11 -07:00
Atlante45
17e3bd6110 CR comments 2014-05-29 18:24:21 -07:00
Andrzej Kapolka
1eace78e47 Hide distances; they no longer need to be publicly visible. 2014-05-29 17:46:25 -07:00
ZappoMan
ac22cebde1 more performance stats debugging 2014-05-29 17:41:40 -07:00
Andrzej Kapolka
34091128d8 Distance tweak. 2014-05-29 17:22:59 -07:00
Andrzej Kapolka
67921c474e Merge branch 'master' of https://github.com/highfidelity/hifi into cascade 2014-05-29 17:09:09 -07:00
Andrzej Kapolka
12beef7fec Apply the new shadow distances to the models, too. 2014-05-29 17:08:36 -07:00
Philip Rosedale
d17eeaf35b remove old oculus yaw offset, expand limit on head yaw 2014-05-29 16:50:13 -07:00
Andrzej Kapolka
0b4484a153 Trying a different way of determining the cascade threshold distances. 2014-05-29 16:49:51 -07:00
Atlante45
b89d0a292c code cleanup 2014-05-29 15:56:46 -07:00
Atlante45
fd0c195132 Code cleanup 2014-05-29 15:55:17 -07:00
Atlante45
c7b636365c Don't attach to joints in range when I grab 2014-05-29 15:50:23 -07:00
Atlante45
73f7390eaa Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach 2014-05-29 15:37:22 -07:00
Clément Brisset
6864fc3b99 Merge pull request #2951 from ZappoMan/perfstats 
add improved detailed rendering and FPS debugging stats
 2014-05-29 15:37:07 -07:00
ZappoMan
7e3ef34e6c CR feedback 2014-05-29 15:34:20 -07:00
Andrzej Kapolka
391902f79b Cascaded shadow maps for models. 2014-05-29 15:30:40 -07:00
Atlante45
3e207f9452 fixed display error in editVoxels with new boundaries 2014-05-29 15:09:42 -07:00
Atlante45
0eb56000ef Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach 2014-05-29 15:02:21 -07:00
Atlante45
980e873a13 Better prints in editModels 2014-05-29 15:02:09 -07:00
barnold1953
133593edd5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-29 14:51:23 -07:00
Clément Brisset
21d1a18bd5 Merge pull request #2949 from AndrewMeadows/inertia 
safe copy of JointState data
 2014-05-29 14:44:05 -07:00
Brad Hefta-Gaub
2c8da2bda7 Merge pull request #2950 from wangyix/flighttime_fix_pull 
Fix for unreasonable flight times
 2014-05-29 14:43:15 -07:00
Atlante45
9c38beb4bc Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach 2014-05-29 14:34:18 -07:00
Atlante45
b34453647b editModels click/drag/attach tweaks 2014-05-29 14:34:10 -07:00
wangyix
4c4ff45f31 removed duplicate function bodies 2014-05-29 14:31:40 -07:00
Atlante45
b91fd19f39 snapped attachment to center and scale them to fit 2014-05-29 14:30:28 -07:00
David Rowe
bd4d167684 Make JavaScript audio samples able to be looped 
Add a "loop" property to AudioInjectorOptions and provide an example JavaScript file.
 2014-05-29 14:13:02 -07:00
wangyix
d8b0b03e59 removed _sequenceNumber from OctreeSendThread 
inlined getSequenceNumber and incrementSequenceNumber
 2014-05-29 13:39:57 -07:00
wangyix
f82be105e8 moved _sequenceNumber back to OctreeQueryNode 2014-05-29 12:54:34 -07:00
Andrzej Kapolka
09231f01f3 Retain "simple" shadows, supply cascaded as option. 2014-05-29 12:48:41 -07:00
ZappoMan
e6966c2155 add improved detailed rendering and FPS debugging stats 2014-05-29 12:12:23 -07:00
Brad Hefta-Gaub
669cafbe24 Merge pull request #2941 from binaryking/disable_keyevents_RSD 
remove all key bindings from the running scripts dialog
 2014-05-29 12:08:06 -07:00
barnold1953
055a62e7e5 Replaced nonfunctioning particleBird.js with awesome particleBirds.js 2014-05-29 11:48:15 -07:00
wangyix
65508b2016 updated packet type version numbers 2014-05-29 11:42:35 -07:00
wangyix
fe1a0e4565 removed debug stuff i missed 2014-05-29 11:27:14 -07:00
wangyix
c87c474877 removed debug info, cleaned code for pull req 2014-05-29 10:39:40 -07:00
Atlante45
37613f086b Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach 
Conflicts:
	interface/src/renderer/Model.cpp
 2014-05-29 10:28:09 -07:00
Mohammed Nafees
2c3784c7d5 Merge branch master of upstream 2014-05-29 22:31:32 +05:30
wangyix
a0f9d2c106 Merge remote-tracking branch 'upstream/master' 2014-05-29 09:20:30 -07:00
AndrewMeadows
b849c07faf Merge pull request #2945 from huffman/19725 
Code Review for Job #19725
 2014-05-29 09:06:43 -07:00
AndrewMeadows
31237003db Merge pull request #2944 from Barnold1953/master 
Disable oculus overlay until it is curved.
 2014-05-29 09:01:52 -07:00
AndrewMeadows
6f2e481638 Merge pull request #2948 from huffman/19728 
Code Review for Job #19728
 2014-05-29 08:59:00 -07:00
AndrewMeadows
21f045ebe0 Merge pull request #2939 from huffman/19648 
Code Review for Job #19648
 2014-05-29 08:53:31 -07:00