Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34417 commits 2 branches 0 tags 1.1 GiB
Commit graph

34417 commits

This branch
This branch
All branches
Author SHA1 Message Date
EdgarPironti
0f057d7229 Set clip for ControlledAC 2015-11-11 15:07:32 -08:00
Clément Brisset
0402933c51 Merge pull request #6366 from ZappoMan/moreEraseHistory 
Left overs bug fix
 2015-11-11 14:33:12 -08:00
Brad Hefta-Gaub
2f903a9513 CR feedback and some cleanup 2015-11-11 14:21:14 -08:00
samcake
e15d2e022c Merge pull request #6369 from AlessandroSigna/controllers 
handControlledHead.js added
 2015-11-11 14:20:05 -08:00
Brad Hefta-Gaub
bdfe304f7a remove some logging 2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub
040bae6014 more debugging 2015-11-11 12:31:50 -08:00
Brad Hefta-Gaub
5576cf188e Merge branch 'master' of https://github.com/highfidelity/hifi into moreEraseHistory 2015-11-11 12:14:03 -08:00
Brad Hefta-Gaub
866116d285 more debugging 2015-11-11 12:13:47 -08:00
AlessandroSigna
e4b1b54e00 added header 2015-11-11 12:07:54 -08:00
AlessandroSigna
f40e46957b handControlledHead.js added 2015-11-11 12:06:51 -08:00
Chris Collins
726d111827 Merge pull request #6371 from hyperlogic/tony/remove-cache-extract 
Remove cache-extract
 2015-11-11 11:25:03 -08:00
Anthony J. Thibault
a763858080 Revert cache-extract 
This reverts these commits:

* 82b26b7 Code convention fixes
* 9a484ff Fixes for windows
* 086b064 Dumps all urls extracted to stdout.
* c002888 Added cache extractor to the tools directory
 2015-11-11 11:22:05 -08:00
Anthony Thibault
820517f340 Merge pull request #6339 from hyperlogic/tony/cache-extract 
Added cache-extract to Tools
 2015-11-11 09:52:53 -08:00
Brad Hefta-Gaub
3316b63bf6 add a fixme comment 2015-11-10 15:46:53 -08:00
Brad Hefta-Gaub
006a1d60c8 keep some additional erase entities history and send to viewers 2015-11-10 15:31:51 -08:00
Eric Levin
a2abc11df1 Merge pull request #6351 from huffman/script-path-resolution 
Update script engine path resolution behavior to behave consistently
 2015-11-10 14:10:42 -08:00
James B. Pollack
4ded489d23 Merge pull request #6362 from ericrius1/helicopter 
Added scripts for helicopter
 2015-11-10 13:53:30 -08:00
ericrius1
bf0677a0ce Moved helicopter scripts into drylake folder 2015-11-10 13:42:15 -08:00
James B. Pollack
ff87a6ce6f Merge pull request #6355 from sethalves/dont-neargrab-nonphysical 
don't attempt to near-grab things that aren't physical
 2015-11-10 13:11:50 -08:00
Brad Hefta-Gaub
aea911ebc2 Merge pull request #6360 from samcake/controllers 
Recording and playback of the Avatar animation update but not quite over
 2015-11-10 12:24:29 -08:00
samcake
d3d5d3a19e Removing useless code 2015-11-10 12:02:20 -08:00
Ryan Huffman
08c2759947 Remove unused include in createTargets.js 2015-11-10 11:39:50 -08:00
Ryan Huffman
031a93cb0e Fix utils include in createPingPongGun.js 2015-11-10 11:39:31 -08:00
Ryan Huffman
5f084730d9 Remove old includes in doll.js 2015-11-10 11:39:12 -08:00
Ryan Huffman
a264ed4795 Remove old includes in bubblewand 2015-11-10 11:38:57 -08:00
Ryan Huffman
a6bc1a2b5b Fix closePaint.js Script.include 2015-11-10 11:38:36 -08:00
Ryan Huffman
90a1fbe04e Fix magBalls.js resolvePath calls 2015-11-10 11:38:16 -08:00
Ryan Huffman
2a349620ee Fix walkSettings.js resolvePath calls 2015-11-10 11:37:59 -08:00
Ryan Huffman
e7e6c63c64 Fix edit.js resolvePath calls 2015-11-10 11:36:53 -08:00
Ryan Huffman
6577c7a13c Fix magBalls include paths 2015-11-10 09:38:52 -08:00
Ryan Huffman
2ad4c5b9e2 Fix walkApi include paths 2015-11-10 09:38:40 -08:00
Ryan Huffman
29fd352169 Fix omniTool test module include path 2015-11-10 09:38:21 -08:00
Ryan Huffman
37d9d98594 Fix breakdance include paths 2015-11-10 09:37:53 -08:00
Ryan Huffman
b802da4fef Fix include in satellite.js 2015-11-10 09:37:36 -08:00
ericrius1
f5308530e6 Removed commented out line 2015-11-10 09:35:35 -08:00
ericrius1
df5353dc16 Merge branch 'refs/heads/master' into helicopter 2015-11-10 09:33:04 -08:00
samcake
2cf2257783 Fix warning 2015-11-10 09:20:43 -08:00
samcake
d1df6854ac Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-10 09:16:28 -08:00
Andrew Meadows
649f2d1d1d Merge pull request #6361 from ZappoMan/fixWarnings 
fix various warnings
 2015-11-10 09:10:55 -08:00
Ryan Huffman
53ca4c857d Fix relative include path in entityCameraTool.js 2015-11-10 08:52:37 -08:00
Brad Hefta-Gaub
4a0a481ac6 more fixes 2015-11-10 08:44:51 -08:00
Brad Hefta-Gaub
0ea901fd72 fix various warnings 2015-11-10 08:34:58 -08:00
Brad Hefta-Gaub
fce6fdcc5e Merge pull request #6356 from Atlante45/master 
Fix warnings on OS X
 2015-11-10 08:15:19 -08:00
Sam Gateau
06a87012ad Removing the setJointTranslations which is not helping... 2015-11-09 23:38:51 -08:00
Sam Gateau
b47c5dbff2 Cleaning the code to remove the old rec format and the use of separate joint Rotationns/Translations arrays 2015-11-09 23:12:04 -08:00
samcake
77e21b7190 Trying to fix the animation recording and playback, but still not good 2015-11-09 18:18:30 -08:00
Brad Davis
1d693ffd66 Merge pull request #6359 from ZappoMan/fixRenderItemLeak 
fix render item leak on Model::reset()
 2015-11-09 17:34:18 -08:00
Brad Hefta-Gaub
021a6e689d added some asserts to test future mistakes that would cause render item leaks 2015-11-09 17:09:17 -08:00
Brad Hefta-Gaub
e47b049200 fix render item leak on Model::reset() 2015-11-09 16:41:40 -08:00
Anthony Thibault
684b9f5f10 Merge pull request #6354 from AndrewMeadows/fix-hip-shift 
fix hips shift when using HMD
 2015-11-09 14:28:37 -08:00