Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 12:17:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
35897 commits 25 branches 0 tags 1.1 GiB
Commit graph

35897 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
c3e9cde7fb beamz 2015-12-10 13:44:53 -08:00
James B. Pollack
1000b60280 far beams 2015-12-10 12:21:50 -08:00
James B. Pollack
31526091d3 create beams at start 2015-12-10 11:13:35 -08:00
James B. Pollack
1134d12ea0 particles 2015-12-09 16:08:32 -08:00
James B. Pollack
2fb318cc53 work with clements branch 2015-12-08 17:52:23 -08:00
Anthony Thibault
2c8cab9360 Merge pull request #6575 from sethalves/parents 
Parents
 2015-12-08 10:29:14 -08:00
Seth Alves
f94655bce2 Merge branch 'parents' of github.com:sethalves/hifi into parents 2015-12-08 10:01:24 -08:00
Seth Alves
3e3fd89402 Merge branch 'parents' of github.com:sethalves/hifi into parents 2015-12-08 09:45:07 -08:00
Seth Alves
dffa37c0e7 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-08 09:44:50 -08:00
Seth Alves
ec9f1e0754 possible fix for crash when grabbing bubblewand 2015-12-08 09:44:43 -08:00
samcake
d12fdb9726 Merge pull request #6584 from birarda/pref-no-auto 
fix for avatar URL text editing, assert in Model.cpp
 2015-12-07 18:11:49 -08:00
Seth Alves
5bf0ddfc2e Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-07 18:05:03 -08:00
Brad Hefta-Gaub
4cbbd252d5 Merge pull request #6587 from jherico/rigel 
Fix crashes on exit due to poor cleanup
 2015-12-07 18:04:52 -08:00
Bradley Austin Davis
b7aeb34a8c Fix crashes on exit due to poor cleanup 2015-12-07 17:50:08 -08:00
Seth Alves
bee423718a Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-07 17:48:05 -08:00
Seth Alves
742288c583 Merge pull request #6586 from Atlante45/master 
Fix grab behavior
 2015-12-07 17:47:47 -08:00
James B. Pollack
6cf1ad464f Merge pull request #6583 from birarda/extension-ci 
use a case insensitive check for extensions in Application
 2015-12-07 17:33:03 -08:00
Atlante45
fc77d6cd40 Fix grab behavior 2015-12-07 17:08:36 -08:00
Seth Alves
71a5dfc4d6 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-07 17:04:02 -08:00
Leonardo Murillo
5d789095b5 Merge pull request #6570 from ctrlaltdavid/20740 
Update Leap Motion script to use animation state handlers
 2015-12-07 16:37:42 -08:00
Stephen Birarda
6dbff93bbd fix assert on model URL change from _renderItemsSet 2015-12-07 16:24:26 -08:00
Stephen Birarda
4a0c6eebd8 change avatar URL when typing completed or accepted 2015-12-07 16:17:59 -08:00
Stephen Birarda
7beaf5e235 force asset upload to use a lowercase extension 2015-12-07 15:18:32 -08:00
Stephen Birarda
0fee004bdd use case insensitive check for extensions 2015-12-07 15:13:14 -08:00
Seth Alves
0bf276efa5 adjust method names to fit convention 2015-12-07 14:37:35 -08:00
Seth Alves
982e986f1a Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-07 14:31:18 -08:00
Seth Alves
f99812a903 adjust method names to fit convention 2015-12-07 14:31:08 -08:00
Brad Davis
353fe774ca Merge pull request #6572 from howard-stearns/fix-render-rate 
Fix render rate.
 2015-12-07 14:12:54 -08:00
Leonardo Murillo
25494ec867 Merge pull request #6562 from Atlante45/baseball 
Baseball
 2015-12-07 14:11:21 -08:00
Atlante45
84bc947854 Typo 2015-12-07 14:00:06 -08:00
Clément Brisset
0be35ec6ea Merge pull request #6578 from hyperlogic/tony/clear-joint-data-bug-fix 
MyAvatar.clearJointData bug fix
 2015-12-07 12:18:28 -08:00
Howard Stearns
72ce46af59 Mac-only. 2015-12-07 11:46:36 -08:00
Clément Brisset
42365acef5 Merge pull request #6561 from ZappoMan/cruftRemovalRedux 
More Cruft Removal
 2015-12-07 11:39:54 -08:00
Howard Stearns
8666cdd689 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-render-rate 2015-12-07 11:27:30 -08:00
Clément Brisset
390836b64e Merge pull request #6431 from huffman/proto-received-message 
Combine Packet and PacketList into ReceivedMessage on receiving end
 2015-12-07 09:58:52 -08:00
Brad Hefta-Gaub
3240c1dbfe Merge pull request #6577 from Atlante45/master 
Fix UNIX warnings
 2015-12-07 09:50:00 -08:00
Ryan Huffman
dd6c8cbe33 Remove verbose piggyback logging 2015-12-07 09:42:04 -08:00
Atlante45
cdf621e8d0 Remove unnecessary moveToThread to remove warning 2015-12-07 09:11:41 -08:00
Anthony J. Thibault
fd4ed29405 MyAvatar.clearJointData bug fix 
MyAvatar.setJointRotation() now works properly after MyAvatar.clearJointData()
 2015-12-07 09:03:40 -08:00
Ryan Huffman
34138f07bd Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-07 08:58:47 -08:00
Ryan Huffman
c2049e5308 Fix udt-test to work with ReceivedMessage updates 2015-12-07 08:52:23 -08:00
Atlante45
f8ee377f01 Fix QOpenGL warning 2015-12-07 08:37:07 -08:00
Atlante45
18198cb6fb Fix missing override 2015-12-07 08:36:49 -08:00
Ryan Huffman
9d47ac000e Merge pull request #6479 from thoys/editjs-left-click 
No more right-click-move editing in edit.js
 2015-12-07 08:29:01 -08:00
Seth Alves
60b8e65520 get file dialog working on Linux 2015-12-07 06:03:58 -08:00
Seth Alves
f6b1ef85b3 remap entity IDs on export also 2015-12-07 06:03:47 -08:00
Seth Alves
f53571ac81 remap IDs on export, also 2015-12-07 05:41:34 -08:00
Seth Alves
96e9580473 change some more parameters back to being pass-by-reference, where it's safe 2015-12-07 05:30:19 -08:00
Thijs Wenker
22bdc1ae84 Make it possible to use the focus-right-click-drag-camera in the edit.js script again. Still keep right-clicking ignore Toolbar and entity selection events. 2015-12-07 13:49:49 +01:00
Seth Alves
3cc423ca03 remap IDs when importing entities 2015-12-06 17:55:48 -08:00