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

36402 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
d8c8778316 rave stick in right orientation 2015-12-16 16:50:27 -08:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
ericrius1
263557cc1a setting dimensions for rave stick 2015-12-16 16:18:57 -08:00
Atlante45
2c8be15e66 Unnecessary shutdown (Already shutting down) 2015-12-16 15:56:22 -08:00
Seth Alves
5f9bdcb2aa fix lock type 2015-12-16 15:52:20 -08:00
ericrius1
6a77ae5db2 adding rave stick 2015-12-16 15:47:34 -08:00
Seth Alves
ea202c5271 Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action 2015-12-16 15:44:44 -08:00
AlessandroSigna
364a70bb46 Fix to avoid MVS warning 2015-12-16 15:41:27 -08:00
Seth Alves
d7affcf811 keep track of palm rotation vs avatar as well as palm translation 2015-12-16 15:41:27 -08:00
Andrew Meadows
45e31ca442 fix warning about unused variable 2015-12-16 15:35:23 -08:00
ericrius1
4155e3af71 refactoring 2015-12-16 15:22:56 -08:00
Seth Alves
489d4099a7 add locationChanged to model entities 2015-12-16 15:21:20 -08:00
Andrew Meadows
ff83f8fc37 fix crash mode when leaving domain with handgun 2015-12-16 15:11:47 -08:00
Andrew Meadows
c14433979b fix crash mode when model late to get collision URL 2015-12-16 15:11:47 -08:00
ericrius1
b29a6b16a9 modularizing flow art tools 2015-12-16 14:40:56 -08:00
Leonardo Murillo
bbe444ffc1 Forgot to add file 2015-12-16 16:40:51 -06:00
Leonardo Murillo
a7b61cf791 Couple of fixes 2015-12-16 16:39:09 -06:00
Atlante45
b709c8162c Fix node flapping race 2015-12-16 14:27:26 -08:00
Atlante45
6bda8d3f18 CR logging category 2015-12-16 14:27:26 -08:00
Atlante45
b55d8f750f CR 2015-12-16 14:27:26 -08:00
Atlante45
0f7093bed7 Whitespace 2015-12-16 14:27:26 -08:00
Atlante45
df24fafe49 CR feedback 2015-12-16 14:27:26 -08:00
Atlante45
a655557af0 Make variable name more obvious 2015-12-16 14:27:26 -08:00
Atlante45
b4dc3b1b47 Fix windows compile error. 2015-12-16 14:27:26 -08:00
Atlante45
a541fdd2df Move OctreeSendThread to the OctreeServer 2015-12-16 14:27:26 -08:00
Atlante45
51ec7ae2ed Keep UUID of node in send thread 2015-12-16 14:27:26 -08:00
Atlante45
3cd1eea1dc Use weak pointer to the Node instead of strong ownership 2015-12-16 14:27:26 -08:00
Atlante45
95da71b19c Assignment don't inherit from NodeData 
This is an artefact from an old design that stuck around
 2015-12-16 14:27:26 -08:00
Atlante45
562d9ac2de Forward QThread's finished signal in GenericThread 2015-12-16 14:27:26 -08:00
Atlante45
346c28f9e2 Remove OctreeServer's static instance 2015-12-16 14:27:26 -08:00
Atlante45
09701fdcf1 deadlock 101 2015-12-16 14:27:26 -08:00
Atlante45
b65cdd2865 Add logging categories to assignment client. 2015-12-16 14:27:26 -08:00
Atlante45
bd7fa266cf Bit of cleanup 2015-12-16 14:27:26 -08:00
Seth Alves
8bfbb69316 clean up code, change try-locks to locks 2015-12-16 14:21:56 -08:00
Leonardo Murillo
66770cc907 Finishing touches 2015-12-16 16:11:35 -06:00
Seth Alves
d3c57821c0 call a method on actions before each physics simulation step. use this to attempt to dejitter held objects 2015-12-16 14:00:04 -08:00
ericrius1
fcfa396912 syntax tweak 2015-12-16 13:58:55 -08:00
Leonardo Murillo
cbed8bf35a NSIS Changes 2015-12-16 15:12:14 -06:00
Leonardo Murillo
5ed422e3a1 Removing unwanted changes 2015-12-16 14:28:49 -06:00
Leonardo Murillo
56ef52022d Removing unwanted changes 2015-12-16 14:28:05 -06:00
Leonardo Murillo
711d02ba2f Consolidating installer checkpoint 2015-12-16 14:26:24 -06:00
Anthony Thibault
0c1ae5bb61 Merge pull request #6657 from AndrewMeadows/avatar-capsule-2 
Correct collision capsule for scaled avatars
 2015-12-16 11:36:08 -08:00
Ryan Huffman
a422103e89 Merge pull request #6662 from AlessandroSigna/overlays 
Exposing emmisive property of the Image3DOverlay
 2015-12-16 10:29:34 -08:00
AlessandroSigna
08f7591787 Fix misspelling 2015-12-16 10:02:47 -08:00
Leonardo Murillo
3e6316f089 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-16 11:34:58 -06:00
Seth Alves
4429890cd8 Merge pull request #6668 from zzmp/fix/fbx-texture 
Load texture by convention with .obj
 2015-12-16 06:47:02 -08:00
Brad Davis
1e5793893b Merge pull request #6665 from ZappoMan/rightClickMenu 
fix bug in simulated left click - make qml menus work
 2015-12-15 21:40:00 -08:00
Zach Pomerantz
3280894e29 Load texture by convention with .obj 2015-12-15 19:30:15 -08:00
Clément Brisset
7c8f019507 Merge pull request #6663 from birarda/baseball 
update link to bat script in createBatButton.js
 2015-12-15 19:26:33 -08:00
ericrius1
61bad36d5c tweaks 2015-12-15 18:49:04 -08:00