Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 17:25:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36105 commits 25 branches 28 tags 1.2 GiB
Commit graph

36105 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
howard-stearns
9512c3f73d Debugging. 
Please enter the commit message for your changes. Lines starting
 2015-12-07 16:58:59 -08:00
howard-stearns
b007617c85 Remove unneeded DisplayPlugin stuff. 2015-12-07 16:56:59 -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
howard-stearns
55cfd1c8b4 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc 2015-12-07 15:49:47 -08:00
howard-stearns
2974241796 typo 2015-12-07 15:49:29 -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
Ken Cooke
86db12acae Fix naming clash with reserved word 2015-12-07 14:03:11 -08:00
Atlante45
84bc947854 Typo 2015-12-07 14:00:06 -08:00
Ken Cooke
90ef92c79b Fix slider layout 2015-12-07 13:34:55 -08:00
Ken Cooke
4803b3bd9f Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb 2015-12-07 13:08:21 -08:00
Ken Cooke
8683bb5002 New reverb parameters 2015-12-07 13:05:30 -08:00
James B. Pollack
27ce0a36d3 cleanup logging 2015-12-07 12:20: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
289c8d6137 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc 2015-12-07 11:54:33 -08:00
Howard Stearns
fc1f312851 Merge branch 'fix-render-rate' into fix-sync-period-calc 2015-12-07 11:54:25 -08:00
Howard Stearns
2f27afd2e5 Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate 2015-12-07 11:51:10 -08:00
Howard Stearns
b82b18fd2e Merge branch 'fix-render-rate' into correct-target-frame-rate 2015-12-07 11:50:57 -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
James B. Pollack
e9f21b4dba make lights parented to flashlight instead of updated in loop 2015-12-07 11:30:10 -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
Howard Stearns
17ecf9b6b7 debugging 2015-12-07 11:26:56 -08:00
Howard Stearns
8303b63491 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc 2015-12-07 10:11:12 -08:00
Howard Stearns
1d4cc7c984 Checkpoint exploring use of getLastSynchronizedElapsed and fixing paintWait (which may go away). 2015-12-07 10:01:46 -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
Howard Stearns
34de4d67d8 DisplayPlugin::getLastSynchronizedElapsed 2015-12-07 09:32:12 -08:00
Howard Stearns
df413c0b14 Temporary debugging aids. 2015-12-07 09:31:06 -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