Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 09:37:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29282 commits 76 branches 59 tags 1.2 GiB
Commit graph

29282 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
052978898e resolve conflicts on merge with upstream master 2015-08-05 11:16:20 -07:00
Andrew Meadows
5be8583b7d Merge pull request #5494 from sethalves/gzip-json-entity-persist-files 
gzip json entity persist files
 2015-08-05 10:56: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
Philip Rosedale
f1a4e185cd Added lifetime and better notes, per PR 2015-08-05 10:04:59 -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
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
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
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
SamGondelman
52be44d621 uninitialized value 2015-08-04 14:50:38 -07:00
Seth Alves
45643a3aad try, try again 2015-08-04 14:36:16 -07:00
Seth Alves
a4bf169ade on windows, copy zlib dll next to programs that link with shared 2015-08-04 14:13:41 -07:00
Seth Alves
ff477b35a8 fix zlib include directory 2015-08-04 11:33:39 -07:00
Seth Alves
fb9fa76018 adjust comments 2015-08-04 08:26:28 -07:00
Seth Alves
5369f4c5eb adjust comments 2015-08-04 08:25:33 -07:00
Seth Alves
7d9cf91bff undo mistaken commit 2015-08-04 07:26:38 -07:00
Howard Stearns
597316b208 Merge pull request #5493 from thoys/fix-model-overlay-rig-crash 
Fix crash for ModelOverlays, caused by Rig changes
 2015-08-04 07:23:52 -07:00
Seth Alves
adcd91e3ff Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options. 2015-08-04 07:23:24 -07:00
Thijs Wenker
4bf6f8ed77 ModelOverlay causes a crash in the Model class. This is because ModelOverlay doesn't give a valid rig to the Model. 2015-08-04 14:47:13 +02:00
Howard Stearns
61afc362e7 For startAnimation (but not startAnimationByRole), use the specified parameters even if the animation 
was already playing.  This fixes the behavior exercised by the squeezeHands.js script.
Fixes https://app.asana.com/0/32622044445063/44025709513292
 2015-08-03 17:00:39 -07:00
Howard Stearns
2e5142e9bb Fix end of idle. 2015-08-03 16:09:48 -07:00
Howard Stearns
cdb697760f Remove some debug. 2015-08-03 15:51:07 -07:00
Howard Stearns
4c1d1a65d5 Provide initial fight club animations and use them in rig. 
Still only active when you do Settings.setValue('enableRig', true) and restart.
(Will be more exposed after fadein/fadeout is implemented.)
 2015-08-03 15:41:15 -07:00
Eric Levin
3f5f75d6d2 Merge pull request #5430 from AlexanderOtavka/floating-ui 
Improvements to overlays.
 2015-08-03 14:35:52 -07:00
Brad Davis
f0ba0a4f47 Merge pull request #5485 from ctrlaltdavid/reduce-hmd-velocity 
Reduce the speed of movement when in HMD view
 2015-08-03 14:16:56 -07:00
David Rowe
5e7cb72843 Reduce the speed of movement when in HMD view 
When using hmdControls.js.
 2015-08-03 13:02:12 -07:00
Zander Otavka
1b4ba75b5a Fix click and drag logic for floatingUIExample.js. 2015-08-03 12:01:15 -07:00
Andrew Meadows
b00d47d62e merge master into cleanup of legacy shapes 2015-08-03 11:19:29 -07:00
Philip Rosedale
761f638ce3 Merge pull request #5466 from sethalves/vhacd-improvements 
vhacd tool -- make the height of the tetrahedrons in 'fatten' mode less tall.
 2015-08-03 11:18:37 -07:00
Zander Otavka
d24006e715 Improve logic around handling click and drag. 2015-08-03 11:14:55 -07:00
Andrew Meadows
acfc907704 Merge pull request #5438 from howard-stearns/rig 
Rig: Bottleneck animation management through a Rig class
 2015-08-03 11:14:21 -07:00
Zander Otavka
055c9dc59b Fix image URLs in controlPanel.js. 2015-08-03 10:41:35 -07:00
Stephen Birarda
7916ca91d5 Merge pull request #5479 from howard-stearns/fix-multiple-local-sounds 
All multiple local sounds
 2015-08-03 10:23:48 -07:00
Howard Stearns
8f616c04fb Fix https://app.asana.com/0/32622044445063/43589567731045 2015-08-02 21:46:39 -07:00
Brad Davis
95620b6385 Merge pull request #5475 from ZappoMan/removeQuads 
remove GL_QUADS from code base
 2015-08-01 19:57:22 -07:00
ZappoMan
493836e363 remove QUADS from GLBackendShared and Format 2015-08-01 17:26:38 -07:00
ZappoMan
771ce6dca3 remove QUAD_STRIP from Circle3DOverlay 2015-08-01 17:20:48 -07:00
ZappoMan
b02f751830 diff redux 2015-08-01 16:53:35 -07:00
ZappoMan
b138c16c7f use Austins QUAD to TRIANGLE_STRIP approach 2015-08-01 16:50:36 -07:00
ZappoMan
05a4a6aa9b implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents 2015-08-01 13:07:56 -07:00
ZappoMan
452225ddaf removed QUADS from Font::drawString() 2015-08-01 11:51:07 -07:00
ZappoMan
1dd6c1117d change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive 2015-08-01 11:29:28 -07:00
Howard Stearns
2713115336 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-31 18:05:47 -07:00
Howard Stearns
0dad1adf7d Speculative guard against crashing. 2015-07-31 18:05:14 -07:00