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

13037 commits

This branch
This branch
All branches
Author SHA1 Message Date
Leonardo Murillo
d8ff7954d5 Merge pull request #2880 from murillodigital/master 
CMake find LibOVR
 2014-05-18 20:59:44 -06:00
Leonardo Murillo
ee8722bc9f CMake find LibOVR 2014-05-18 20:59:41 -06:00
Brad Hefta-Gaub
c5cfca25a3 Merge pull request #2874 from Atlante45/anchers_apply_rotation_and_scale 
Added rotation and scale to overlay anchers
 2014-05-18 19:40:28 -07:00
Leonardo Murillo
5e0a6f80f0 Merge pull request #2878 from murillodigital/master 
CMake find LibOVR
 2014-05-18 18:43:23 -06:00
Leonardo Murillo
5a7a876697 CMake find LibOVR 2014-05-18 18:43:16 -06:00
Atlante45
2839f5207b Merge branch 'master' of https://github.com/highfidelity/hifi into anchers_apply_rotation_and_scale 2014-05-17 22:08:39 -07:00
Atlante45
7d40790260 Don't compute avatar anchor specs if uneeded 2014-05-17 22:08:28 -07:00
Andrzej Kapolka
914634f73a Merge pull request #2876 from ey6es/master 
Fix for stopping scripts on Windows.
 2014-05-17 19:10:52 -07:00
Andrzej Kapolka
5ebb2659a4 Fixed initialization order warning. 2014-05-17 19:02:14 -07:00
Andrzej Kapolka
c8f2dae7bd Fix for stopping scripts on Windows. 2014-05-17 18:45:54 -07:00
Atlante45
0edcd732fe Added rotation and scale to overlay anchers 2014-05-16 17:36:27 -07:00
Andrzej Kapolka
86f020dd25 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-16 17:23:10 -07:00
Brad Hefta-Gaub
2c8efa05b7 Merge pull request #2873 from birarda/master 
assume use of a Qt build without bearer management
 2014-05-16 17:22:55 -07:00
Brad Hefta-Gaub
06a0084269 Merge pull request #2862 from AndrewMeadows/inertia 
improved model bounding shapes
 2014-05-16 17:22:28 -07:00
Brad Hefta-Gaub
31455e6cb0 Merge pull request #2871 from ey6es/master 
Better rotations with alternate IK.
 2014-05-16 17:22:09 -07:00
Andrzej Kapolka
1bbd9c326a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-16 17:20:40 -07:00
Andrzej Kapolka
c99a60ce66 Merge pull request #2872 from ZappoMan/modelserver 
Bug Fixes in Models
 2014-05-16 17:20:25 -07:00
Stephen Birarda
e6fa1c55db assume we are using a Qt build without bearer management 2014-05-16 17:06:17 -07:00
ZappoMan
bb204154a1 tweak 2014-05-16 16:59:58 -07:00
ZappoMan
51ad8194de fix two bugs in models not rendering 2014-05-16 16:55:37 -07:00
ZappoMan
0e446d0fc5 fix two bugs in models not rendering 2014-05-16 16:53:14 -07:00
Andrzej Kapolka
6eaa549f65 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-16 16:26:47 -07:00
Andrzej Kapolka
4a23c0cfd9 Fix for arms' getting twisted up with new IK. 2014-05-16 16:25:24 -07:00
Philip Rosedale
d54ff7a2cf Merge pull request #2869 from huffman/19630 
Code Review for Job #19630
 2014-05-16 16:00:05 -07:00
Stephen Birarda
e5c0d712c4 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-16 15:07:00 -07:00
Philip Rosedale
18251d7251 Merge pull request #2870 from ey6es/priority 
Basic support for joysticks using SDL, shoehorn PrioVR position/joysticks into palm data.
 2014-05-16 14:58:09 -07:00
Andrzej Kapolka
956c5d2eb6 More joystick fixes. 2014-05-16 14:24:49 -07:00
Ryan Huffman
cc952f9cee Reset node bounds overlay text when no nodes are selected 2014-05-16 13:56:28 -07:00
Ryan Huffman
4100e5c64a Merge branch '19630' of github.com:huffman/hifi into 19630 2014-05-16 13:21:44 -07:00
Ryan Huffman
e5d6a66ca9 Use char array instead of QString in NodeBounds 2014-05-16 13:21:10 -07:00
ZappoMan
b7cc97534f Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-16 12:53:41 -07:00
Ryan Huffman
3f2d08871c Reorder includes in NodeBounds.cpp 2014-05-16 12:24:26 -07:00
Ryan Huffman
32974b4003 Remove QGLWidget include from NodeBounds 2014-05-16 12:16:42 -07:00
Andrzej Kapolka
4314e42116 Merge branch 'priority' of https://github.com/ey6es/hifi into priority 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/PrioVR.h
	interface/src/scripting/ControllerScriptingInterface.cpp
 2014-05-16 12:16:40 -07:00
Andrzej Kapolka
a7234fd8d3 Stuff the joystick and position bits into the palms. 2014-05-16 12:10:21 -07:00
Ryan Huffman
b48b8aab12 Merge branch 'master' of git://github.com/highfidelity/hifi into 19630 
Conflicts:
	interface/src/Application.cpp
 2014-05-16 11:48:58 -07:00
Andrzej Kapolka
c42368594d Scratch that; going to shoehorn joystick data into palms. 2014-05-16 11:24:45 -07:00
Andrzej Kapolka
20eadab970 Lock joystick states for thread safety. 2014-05-16 11:18:21 -07:00
Andrzej Kapolka
5a2f61084e Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-16 11:09:12 -07:00
Brad Hefta-Gaub
c77b234621 Merge pull request #2868 from PhilipRosedale/master 
Improved hydra movement
 2014-05-16 11:02:29 -07:00
Stephen Birarda
514d6d64c4 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-16 10:43:12 -07:00
ZappoMan
e7513ff7c6 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-16 10:40:41 -07:00
Ryan Huffman
59b23efbd8 Update old comment 2014-05-16 10:37:28 -07:00
Ryan Huffman
91b1910b86 Explicitly null-terminate a string 2014-05-16 10:28:21 -07:00
Ryan Huffman
dbbd3351ef Fix node bounds overlay blinking 
QString.to* do not seem to return null terminated strings.
 2014-05-16 10:25:15 -07:00
ZappoMan
f5b4e1da37 fix potential floating point error when animations have no frames 2014-05-16 10:00:35 -07:00
Ryan Huffman
ea5dfbdf28 Update parameter to const 2014-05-16 09:53:48 -07:00
Philip Rosedale
5dcd942e8e removed dead code 2014-05-16 09:44:03 -07:00
Philip Rosedale
4532c93419 debug off 2014-05-16 09:36:55 -07:00
Philip Rosedale
25f1e180f5 revert test change 2014-05-16 09:34:54 -07:00