Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 19:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
44851 commits 71 branches 56 tags 1.2 GiB
Commit graph

44851 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
93081e73d8 thumb and trigger 2016-07-07 12:12:22 -07:00
Brad Hefta-Gaub
eafd8999bc Merge pull request #8202 from jherico/cpu_opt_modelbounds 
Optimize updateModelBounds
 2016-07-07 11:52:44 -07:00
James B. Pollack
bd3fa60927 Merge branch 'viveteleporter' of github.com:imgntn/hifi into viveteleporter 2016-07-07 11:45:42 -07:00
James B. Pollack
8212ada4de introduce delay 2016-07-07 11:42:41 -07:00
Brad Hefta-Gaub
6d78c9e7ad Merge pull request #8201 from huffman/fix/add-missing-loading-images 
Add missing loading images for Asset Browser
 2016-07-07 11:35:43 -07:00
Brad Davis
dfdc1ca1c6 Ensuring render thread is highest priority 2016-07-07 11:14:56 -07:00
Brad Davis
b73fe24848 PR feedback 2016-07-07 11:12:55 -07:00
Brad Davis
eff1c65388 Reduce the number of temporary objects in batch commands 2016-07-07 11:12:55 -07:00
Brad Davis
721cd79b57 Aggressive batch pre-allocation 2016-07-07 11:12:54 -07:00
Brad Davis
c7382ea886 Optimize updateModelBounds 2016-07-07 11:11:26 -07:00
Brad Davis
5be238db08 Suppressing glew link warnings 2016-07-07 11:10:59 -07:00
Brad Davis
09f2a10613 Add rendering performance tool 2016-07-07 11:10:58 -07:00
Brad Hefta-Gaub
38f0cd218b make client server plugins properly copy into plugins directory 2016-07-07 10:31:12 -07:00
Ryan Huffman
d2fedee656 Add missing loading images for Asset Browser 2016-07-07 10:22:52 -07:00
Seth Alves
6786a07ac2 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-07 09:53:24 -07:00
Brad Hefta-Gaub
ac2d3e1cc7 Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-07 09:47:19 -07:00
Brad Hefta-Gaub
7724065298 Merge pull request #8196 from howard-stearns/loaded-machine 
an objective test of basic performance on struggling machines
 2016-07-07 09:02:31 -07:00
Brad Hefta-Gaub
abcd1e0062 Merge pull request #8164 from SamGondelman/macHMDPreview 
Added Mac preview image if VSync is enabled
 2016-07-07 09:01:40 -07:00
Brad Hefta-Gaub
c9fd4894be Merge pull request #8189 from jherico/entity_script_safety 
Don't trigger entity scripts without scripting interface
 2016-07-07 09:01:18 -07:00
Brad Hefta-Gaub
10500d0773 Merge pull request #8191 from howard-stearns/basic-hand-controller-edit 
basic hand-controller editing
 2016-07-07 08:58:54 -07:00
James B. Pollack
3c3bad4d3b Merge remote-tracking branch 'upstream/master' into viveteleporter 2016-07-07 01:36:39 -07:00
James B. Pollack
54e0c131a5 cleanup and protect against some interval naughtiness 2016-07-06 18:30:50 -07:00
James B. Pollack
5626938fb4 add instant mode 2016-07-06 18:13:42 -07:00
Brad Davis
5220b52cd9 Don't trigger entity scripts without scripting interface 2016-07-06 18:13:15 -07:00
James B. Pollack
1728878982 working smooth arrival 2016-07-06 17:52:18 -07:00
SamGondelman
d05a27e0e6 embed image locally 2016-07-06 17:27:53 -07:00
Brad Hefta-Gaub
41a74f7652 Merge pull request #8193 from huffman/fix/model-overlay-dims 
Fix model overlays not correctly scaling
 2016-07-06 16:17:22 -07:00
Howard Stearns
74ef82f800 add 'dynamic' property as a load 2016-07-06 16:15:02 -07:00
Andrew Meadows
3c4f9f8016 refert debug hack 2016-07-06 15:51:17 -07:00
Anthony J. Thibault
2db8160568 handControllerGrab improvements 
* Made handControllerGrab eslint clean
* A model overlay is used instead of a sphere to draw equip hotspots.
* The equip hotspot model will grow in size by 10% when hand is near enough to equip it.
* The hand controller will now perform a haptic pulse when your hand is near enough to an equip hotspot.
* Near triggers events will also perform a haptic pulse
 2016-07-06 15:46:14 -07:00
James B. Pollack
5cb585aec3 remove debug prints 2016-07-06 15:25:01 -07:00
James B. Pollack
696169ed37 terminate lines at intersection 2016-07-06 15:19:10 -07:00
James B. Pollack
dc8e21d76c cleanup stretchy stuff 2016-07-06 15:16:31 -07:00
howard-stearns
110f5e9e2a Don't compare distance when no intersection. 2016-07-06 15:08:57 -07:00
howard-stearns
9495d93a72 Merge branch 'master' of https://github.com/highfidelity/hifi into basic-hand-controller-edit 2016-07-06 15:06:51 -07:00
Andrew Meadows
15ff7bc731 final hack tweak 2016-07-06 14:35:57 -07:00
Andrew Meadows
301a9f4434 improved hack logging 2016-07-06 14:31:43 -07:00
Andrew Meadows
11ef245671 temp hack for debugging 2016-07-06 14:28:09 -07:00
Anthony J. Thibault
a07970f053 Fix for one-frame glitch when changing dimensions of a model entity. 
This was due to Model::setScaleToFit being called on the script thread instead of the main thread.
 2016-07-06 14:09:55 -07:00
James B. Pollack
e993a69519 last commit for stretched beams -- doesnt work at long distances due to lack of precision 2016-07-06 14:06:53 -07:00
Howard Stearns
8ef9f48221 An objective test of basic performance on struggling machines. 2016-07-06 13:42:46 -07:00
Brad Hefta-Gaub
9333c7dcca Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-06 13:26:19 -07:00
James B. Pollack
b2ef491b97 rotate target toward you 2016-07-06 13:20:42 -07:00
Andrew Meadows
5659d57ac3 fix shape generation for SIMPLE_COMPOUND 2016-07-06 13:00:57 -07:00
James B. Pollack
2d073cc99c working teleporter in huffmans build 2016-07-06 12:31:03 -07:00
SamGondelman
890b22426c added folder selection dialog on first snapshot 2016-07-06 12:15:34 -07:00
SamGondelman
6a44ea76e5 fixed snapshot preview on windows 2016-07-06 11:57:29 -07:00
Ryan Huffman
7d803b7513 Fix model overlays not correctly scaling 2016-07-06 11:54:39 -07:00
Andrew Meadows
6cbc566a77 remove debug cruft 2016-07-06 11:53:26 -07:00
Andrew Meadows
92af849204 bump version for new shape types 2016-07-06 10:52:01 -07:00