Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 11:59:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
36156 commits 75 branches 59 tags 1.2 GiB
Commit graph

14633 commits

Author SHA1 Message Date
Atlante45
b7ba3c5f17 More warning fixes 2015-12-11 17:02:03 -08:00
Atlante45
146581714a More warning fixes 2015-12-11 16:17:41 -08:00
Atlante45
f308ef7aa9 Move QOpenGL wrappers to the gl lib 2015-12-11 16:17:17 -08:00
Atlante45
d3224bfde3 More warning fixes 2015-12-11 16:03:44 -08:00
Atlante45
da63357254 More warning fixes 2015-12-11 15:42:15 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Atlante45
f72eb679c6 More warning fixes 2015-12-11 15:04:33 -08:00
Atlante45
a07d7494f0 More OS X warning cleanup 2015-12-11 14:20:36 -08:00
Brad Hefta-Gaub
30fd96b509 Merge pull request #6613 from jherico/threaded_qml 
Moving QML rendering off the main thread
 2015-12-11 11:43:04 -08:00
Bradley Austin Davis
ae1345bb13 Adding nsight instrumenting to the QML render thread 2015-12-11 11:00:33 -08:00
samcake
94b6ca4450 FIxing the bad lambda capture for local variables 2015-12-11 10:48:58 -08:00
Bradley Austin Davis
265bd8ee67 Moving QML rendering off the main thread 2015-12-11 10:28:31 -08:00
Brad Hefta-Gaub
a7a924153a Merge pull request #6617 from huffman/entity-query-keyhole 
Add keyhole radius to OctreeQuery
 2015-12-11 09:35:46 -08:00
Brad Hefta-Gaub
b5e07d9af5 Merge pull request #6625 from howard-stearns/scriptable-anim-var-triggers 
Scriptable anim var triggers
 2015-12-11 09:21:15 -08:00
Brad Hefta-Gaub
ff49ed7a65 Merge pull request #6621 from samcake/controllers 
Fixing the Collision Geometry display
 2015-12-11 09:15:52 -08:00
Ryan Huffman
87e30a2157 Remove EntityQuery version and just append new data to end 2015-12-11 09:03:39 -08:00
Howard Stearns
e8ffa598a2 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptable-anim-var-triggers 2015-12-10 20:40:42 -08:00
Howard Stearns
dfec222c81 Report animation triggers to normal javascript animationStateHandlers, and update away.js as an example. 2015-12-10 20:39:01 -08:00
Brad Hefta-Gaub
a472d293bb Merge pull request #6599 from jherico/aeryn-sdl2 
Moving SDL2 to external plugin
 2015-12-10 18:02:15 -08:00
samcake
40bf721ac5 Fixing merging problem 2015-12-10 17:16:06 -08:00
samcake
3728a9c6f0 Merging with Master 2015-12-10 16:55:30 -08:00
samcake
20f3d6abe1 REmoving comments 2015-12-10 16:52:03 -08:00
samcake
dffb83a488 Potentially working correctly 2015-12-10 16:31:00 -08:00
Howard Stearns
f6cd04680d Merge pull request #6618 from hyperlogic/tony/sixense-debug-draw-fix 
Fix for sixense debug draw after migration to plugin.
 2015-12-10 16:14:43 -08:00
Howard Stearns
585911fe98 Merge pull request #6612 from sethalves/no-physics-until-ready 
No physics until ready
 2015-12-10 16:09:49 -08:00
Anthony J. Thibault
1af780a664 Fix for sixense debug draw after move to plugin. 
static variables used to hold a Singleton cannot be shared across dll boundaries by default.
This uses the globalInstance template to store the instance as a property on the QApplication.
 2015-12-10 15:05:27 -08:00
samcake
5805cc8f2b Adding the AABox transform features (from Extents) adn introducing a simple MeshPartPayload to render simple geometry 2015-12-10 14:59:04 -08:00
Ryan Huffman
6acf3603d0 Update naming and number of entity query version 2015-12-10 14:58:08 -08:00
Brad Davis
98263f0c0d Moving sdl2 to external plugin 2015-12-10 14:56:41 -08:00
Ryan Huffman
cfcc07da2e Fix current version for EntityQuery 2015-12-10 14:49:28 -08:00
Ryan Huffman
46d645376b Fix misspelling of entities 2015-12-10 14:38:44 -08:00
Ryan Huffman
b6ecd539df Merge branch 'master' of https://github.com/highfidelity/hifi into entity-query-keyhole 2015-12-10 14:36:03 -08:00
Ryan Huffman
b5e3dce376 Add keyhole radius to OctreeQuery 2015-12-10 14:34:28 -08:00
Atlante45
a1df320ffb Merge branch 'master' of https://github.com/highfidelity/hifi into particle 2015-12-10 13:37:34 -08:00
Atlante45
03ee07c8b7 Merge branch 'master' of https://github.com/highfidelity/hifi into particle 2015-12-10 13:37:20 -08:00
Brad Hefta-Gaub
e133bd867a Merge pull request #6600 from jherico/aeryn-sixense 
Moving Sixense to external plugin
 2015-12-10 13:33:17 -08:00
Seth Alves
8ca6c7acc3 Merge pull request #6611 from Atlante45/attachments 
Fix Attachments jitter
 2015-12-10 11:46:19 -08:00
Seth Alves
dbde0b641e Merge branch 'attachments' of github.com:Atlante45/hifi into no-physics-until-ready 2015-12-10 11:38:08 -08:00
Seth Alves
d10221f53a merge from upstream 2015-12-10 11:21:36 -08:00
Seth Alves
3a35df191a remove an off-brand change 2015-12-10 11:19:26 -08:00
Seth Alves
1467a9d2eb handle initial simulation of _model 2015-12-10 11:17:40 -08:00
Brad Hefta-Gaub
589adde41e Merge pull request #6541 from howard-stearns/correct-target-frame-rate 
Don't limit avatar rendering when not vsync'd
 2015-12-10 11:17:23 -08:00
Atlante45
6f29d9e7b8 Use strongly typed enum instead of nested alias 2015-12-10 11:10:09 -08:00
James B. Pollack
d21e4ff5e1 Merge pull request #6592 from huffman/script-engine-fixes 
Fix concurrency issues for bools in ScriptEngine
 2015-12-10 10:48:54 -08:00
Brad Davis
645695d5d5 Moving sixense to external plugin 2015-12-10 10:44:23 -08:00
Seth Alves
2dd40beed5 formatting 2015-12-10 10:42:25 -08:00
Seth Alves
33a65385e8 Merge branch 'unix_fix' of github.com:jherico/hifi into no-physics-until-ready 2015-12-10 10:29:13 -08:00
Seth Alves
d243132b5c quiet some logging 2015-12-10 10:28:24 -08:00
Seth Alves
b4ef2b4a08 quiet some logging 2015-12-10 10:27:31 -08:00
Bradley Austin Davis
5053fcd113 Fix unix builds 2015-12-10 10:19:13 -08:00