Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 10:32:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40560 commits 75 branches 59 tags 1.2 GiB
Commit graph

40560 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
447918d148 Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes 
Avatar & Animation cppcheck static analysis fixes
 2016-03-14 18:58:25 -07:00
Brad Hefta-Gaub
4018242045 Merge pull request #7360 from zzmp/feat/emplace-render-jobs 
Emplace render engine jobs
 2016-03-14 18:57:30 -07:00
Zach Pomerantz
ff0862b594 Emplace render engine jobs 2016-03-14 17:51:43 -07:00
James B. Pollack
4017bea60f Merge pull request #7356 from AndrewMeadows/anemone 
anemones are not urchins
 2016-03-14 17:45:19 -07:00
Andrew Meadows
98eef26e69 Merge pull request #7357 from hyperlogic/tony/fix-for-set-swing-limits 
SwingTwistConstriant: fix for bad index.
 2016-03-14 17:36:42 -07:00
Anthony J. Thibault
16a57bda81 SwingTwistConstriant: fix for bad index. 2016-03-14 17:30:53 -07:00
Andrew Meadows
cb62af770f namechange urchin --> anemone 2016-03-14 17:10:33 -07:00
Andrew Meadows
d18f988cba namechange URCHIN --> ANEMONE 2016-03-14 17:07:35 -07:00
Clément Brisset
e38c08ebd9 Merge pull request #7335 from imgntn/photosphere 
Add Photo Sphere Example
 2016-03-14 16:56:17 -07:00
Anthony Thibault
5623fc1b89 Merge pull request #7328 from AndrewMeadows/dynamic-constraints 
reduce clamping of animation underpose by IK system
 2016-03-14 16:47:00 -07:00
Philip Rosedale
c6de24f953 Merge pull request #7332 from imgntn/newfishes 
Add animated urchin to fishtank
 2016-03-14 14:29:41 -07:00
Philip Rosedale
5e532a703a Merge pull request #7352 from ZappoMan/fixLogSpam 
reduce log spam
 2016-03-14 14:26:23 -07:00
ZappoMan
1a17de6dbb reduce log spam 2016-03-14 14:02:25 -07:00
Howard Stearns
0f0b4519fd Merge pull request #7350 from sethalves/try-again-on-queryAACube 
try again on queryAACube
 2016-03-14 13:30:46 -07:00
Seth Alves
e8a03b725f try again on queryAACube 2016-03-14 13:03:27 -07:00
Andrew Meadows
aed0db743b Merge pull request #7341 from hyperlogic/tony/white-lines 
ApplicationOverlay: Fix for gray line at top of HMD UI overlay
 2016-03-14 12:49:57 -07:00
Andrew Meadows
5eadc265af Merge pull request #7327 from sethalves/auto-set-query-aa-cube 
if needed, set queryAACube when dimensions are updated
 2016-03-14 11:35:13 -07:00
Seth Alves
5292e537ea further unmangle merge 2016-03-14 11:22:01 -07:00
Seth Alves
908481d5d4 merge from upstream 2016-03-14 11:15:16 -07:00
Brad Hefta-Gaub
830f53cc46 Merge pull request #7345 from sethalves/delete-parentless-entities-redux 
Delete parentless entities redux
 2016-03-14 10:04:22 -07:00
Chris Collins
e577658315 Merge pull request #7333 from PhilipRosedale/testSound 
playTestSound.js - better clip for testing/showing audio
 2016-03-14 08:44:28 -07:00
Brad Hefta-Gaub
7f4cbeda00 Merge pull request #7343 from jherico/procedural_time 
Fix iDate uniform in procedurals to be continuous
 2016-03-13 22:08:54 -07:00
Anthony Thibault
1e94d9bdf5 interface/src/avatar: cppcheck fixes 2016-03-13 18:56:15 -07:00
Anthony Thibault
54cc49283c libraries/avatars: cppcheck warning fixes 2016-03-13 18:19:42 -07:00
Anthony Thibault
9f30556084 libraries/animation: cppcheck fixes 
* Fix for potential bug in AnimLoop due to _maxFrameIndexHint being uninitialized.
* made more single argument constructors explicit.
 2016-03-13 17:17:34 -07:00
Anthony Thibault
11fcf00b2a AnimSkeleton.h: made single argument ctors explicit 2016-03-13 16:55:34 -07:00
Anthony Thibault
02b2281def AnimVarient.h: cppcheck fixes 
* make all constructors explicit.
* remove static string comparison in assert.
 2016-03-13 16:51:57 -07:00
Brad Hefta-Gaub
9e0d9f5748 Merge pull request #7337 from sethalves/disable-oculus-legacy-on-linux 
don't build oculus-legacy plugin on Linux
 2016-03-13 12:26:37 -07:00
Brad Hefta-Gaub
27fec45e95 Merge pull request #7342 from imgntn/consoleversion2 
Add version number and make adding new menu items to Server Console easier
 2016-03-13 12:25:04 -07:00
Brad Davis
798d2a73db Merge pull request #7326 from ZappoMan/toggleOverlay 
Various Overlay, Menu, and Away Mode bug fixes
 2016-03-13 11:44:19 -07:00
Brad Hefta-Gaub
d4d113d47d Merge pull request #7346 from sethalves/fix-crash 
fix a crash
 2016-03-13 11:18:35 -07:00
Seth Alves
dbd548a8c7 fix a crash 2016-03-13 11:01:11 -07:00
Seth Alves
7641b1e99d remove debug print 2016-03-13 08:45:23 -07:00
Seth Alves
415f21c189 be more aggressive about putting entities into the missing-its-parent list 2016-03-13 08:35:21 -07:00
Seth Alves
0a2fb77698 delete child entities when parent is deleted 2016-03-13 07:04:50 -07:00
Eric Levin
8d2ab50616 Merge pull request #7344 from jherico/vive_crash 
Fix vive crash on deactivate
 2016-03-12 22:03:38 -08:00
Brad Davis
27033e5bb5 Fix vive crash on deactivate 2016-03-12 21:48:36 -08:00
Brad Davis
27ecdffeb3 Fix iDate uniform in procedurals to be continuous 2016-03-12 16:46:15 -08:00
James B. Pollack
96bc17cd5e Update photo_sphere.js 2016-03-12 16:01:10 -08:00
James B. Pollack
b929089af7 options 2016-03-12 15:01:34 -08:00
James B. Pollack
98d4f34d64 enable 2016-03-12 14:59:54 -08:00
James B. Pollack
03a109b60f menu 2016-03-12 14:54:10 -08:00
Anthony Thibault
ea95295e66 ApplicationOveraly: Fix for gray line at top of HMD UI overlay 2016-03-12 14:52:26 -08:00
James Pollack
50e7bd7742 claenup 2016-03-12 13:42:18 -08:00
James B. Pollack
f409127f1d start 2016-03-12 12:18:54 -08:00
Seth Alves
29fd3e4ea6 Merge branch 'master' of github.com:highfidelity/hifi into disable-oculus-legacy-on-linux 2016-03-12 08:59:29 -08:00
Brad Hefta-Gaub
8420e67b54 Merge pull request #7338 from highfidelity/revert-7331-consoleversion 
Revert "Show Server Console Version"
 2016-03-12 08:54:14 -08:00
Brad Hefta-Gaub
90f5dd50a5 Revert "Show Server Console Version" 2016-03-12 08:38:41 -08:00
Seth Alves
d036e0618d don't build oculus-legacy plugin on linux 2016-03-12 07:54:59 -08:00
James B. Pollack
b0109133c0 add git handle 2016-03-11 22:02:49 -08:00