Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 16:53:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
16337 commits 75 branches 59 tags 1.2 GiB
Commit graph

16337 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
4aecb4b5eb Reenable disabling of update in gracefulControls.js 2014-09-05 11:37:57 -07:00
Ryan Huffman
6d29ef0f41 Add brake to gracefulMovement.js 2014-09-05 10:45:22 -07:00
Ryan Huffman
e590f992f6 Merge branch 'master' of git://github.com/highfidelity/hifi into 19831 2014-09-05 10:18:02 -07:00
Brad Hefta-Gaub
c4baf86f9d Merge pull request #3351 from Atlante45/rec_file_format_tweaks 
New Recorder/ControlACs UI
 2014-09-04 23:09:42 -07:00
Brad Hefta-Gaub
9648c0d64e Merge pull request #3343 from AndrewMeadows/ragdoll 
Ragdoll Part 12: first pass avatar skeleton collides with voxels
 2014-09-04 23:09:08 -07:00
Philip Rosedale
886add11db Merge pull request #3342 from ey6es/metavoxels 
Very basic beginnings of an implementation of the dual contour algorithm, including necessary data representation and tools.
 2014-09-04 21:46:14 -07:00
Andrzej Kapolka
c340445f33 Hopefully, a fix for the Windows build; looks like "near" is a keyword. 2014-09-04 17:42:33 -07:00
Andrzej Kapolka
b275af48ed Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-04 17:26:34 -07:00
Andrzej Kapolka
83d209dbdc Remove unused variables. 2014-09-04 17:26:01 -07:00
Andrzej Kapolka
137d3738fc Fix for preview render. 2014-09-04 17:23:09 -07:00
Andrzej Kapolka
21f3f2b90e Switch to deferred lighting for metavoxels. 2014-09-04 17:17:44 -07:00
Clément Brisset
fb8b3020e5 Merge pull request #3353 from ZappoMan/virtualEntities 
fix couple of Entities issues: possible static memory corruption, sphere colors
 2014-09-04 16:23:38 -07:00
ZappoMan
931e5fa408 fix potential static memory corruption 2014-09-04 15:43:51 -07:00
Andrew Meadows
27621b316d clarify how the size of the cube is computed 2014-09-04 15:41:24 -07:00
Andrew Meadows
7cde6811ca remove unecessary AACube::operator<() 2014-09-04 15:21:19 -07:00
Andrew Meadows
faf31f268e use QHash, not QVector, for Octree content query 2014-09-04 15:20:07 -07:00
ZappoMan
e4deb59892 fix sphere colors 2014-09-04 15:00:52 -07:00
Atlante45
d7e135c831 Changed 2 icons 2014-09-04 14:58:30 -07:00
Atlante45
d2ba1ea769 Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-04 14:36:14 -07:00
Clément Brisset
4940615a83 Merge pull request #3350 from huffman/19935 
Code Review for Job #19935
 2014-09-04 12:36:51 -07:00
Ryan Huffman
d54dc5f2aa Merge branch 'master' of github.com:highfidelity/hifi into 19935 
Conflicts:
	interface/src/Menu.h
 2014-09-04 12:05:17 -07:00
Philip Rosedale
e6ba730c3e Merge pull request #3352 from ZappoMan/virtualEntities 
tweaks to butterflies, animation, plus reformatting to match coding standard
 2014-09-04 11:42:44 -07:00
ZappoMan
ac45a56bf9 tweaks to butterflies, animation, plus reformatting to match coding standard 2014-09-04 11:40:32 -07:00
Clément Brisset
cc6d70c5ab Merge pull request #3336 from huffman/19995 
Code Review for Job #19995
 2014-09-04 11:37:35 -07:00
Atlante45
c0a7334010 Fixed flipped icons 2014-09-04 11:34:02 -07:00
Stephen Birarda
2678bd3d9e Merge pull request #3348 from ZappoMan/virtualEntities 
patch for possible static memory corruption on large edit entity messages
 2014-09-04 10:48:59 -07:00
Brad Hefta-Gaub
0d69122ec1 Merge pull request #3344 from huffman/19944 
Code Review for Job #19944
 2014-09-04 10:25:53 -07:00
Brad Hefta-Gaub
02af53c8e8 Merge pull request #3349 from AndrewMeadows/inertia 
fix for bad avatar bounding shape on resize
 2014-09-04 10:25:27 -07:00
Andrew Meadows
1e19566e93 fix for bad avatar bounding shape on resize 2014-09-04 09:53:07 -07:00
ZappoMan
957991b67e patch for possible static memory corruption on large edit entity messages 2014-09-04 09:52:26 -07:00
Brad Hefta-Gaub
100f9c9ac4 Merge pull request #3347 from birarda/domain-connect-debug 
add debug to show that domain connection is being attempted
 2014-09-04 09:30:29 -07:00
Stephen Birarda
e338c600c3 add debug to show that domain connection is being attempted 2014-09-04 09:29:29 -07:00
Atlante45
ef51782f92 New ControlACs UI 2014-09-03 20:32:18 -07:00
Atlante45
417393c22e New Recorder UI 2014-09-03 20:31:57 -07:00
Atlante45
18fdb340c1 extended toolBars.js 2014-09-03 20:30:15 -07:00
Philip Rosedale
cdaf59c962 Merge pull request #3346 from ZappoMan/virtualEntities 
More Entities work
 2014-09-03 20:09:36 -07:00
ZappoMan
68d2be97f7 formatting fixes 2014-09-03 19:46:33 -07:00
ZappoMan
be7a03b97e flock of butterflies as entities 2014-09-03 19:41:53 -07:00
ZappoMan
31716697c0 new example script 2014-09-03 18:35:09 -07:00
ZappoMan
3e1401014d more model naming cleanup and fixing example scripts 2014-09-03 18:32:44 -07:00
ZappoMan
5b8be780a7 add color to sphere property editor 2014-09-03 18:03:00 -07:00
Brad Hefta-Gaub
21c7a7c8a7 Merge pull request #3345 from ZappoMan/virtualEntities 
remove assert in favor of warning
 2014-09-03 17:38:07 -07:00
ZappoMan
e680260c89 remove assert in favor of warning 2014-09-03 17:17:36 -07:00
ZappoMan
d89b29581b remove assert in favor of warning 2014-09-03 17:14:34 -07:00
AndrewMeadows
8223481ecb Merge pull request #3341 from huffman/19967 
Code Review for Job #19967
 2014-09-03 16:51:19 -07:00
AndrewMeadows
9036954d38 Merge pull request #3311 from huffman/fix-wm-close 
Update assignment client to close on WM_CLOSE message on Windows
 2014-09-03 16:43:12 -07:00
Andrew Meadows
e120697a9b merge upstream/master into andrew/ragdoll 2014-09-03 15:49:32 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities 
Model Server to Entity Server Refactoring
 2014-09-03 15:48:58 -07:00
Andrew Meadows
a3b26582ba fix for nan in sphereVsAACubeHelper() 2014-09-03 15:39:26 -07:00
ZappoMan
d08e7ef96d fix bug in way too small entities 2014-09-03 15:20:42 -07:00