Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39232 commits 29 branches 0 tags 1.1 GiB
Commit graph

15874 commits

Author SHA1 Message Date
Andrew Meadows
80aee563fc Merge pull request #7119 from sethalves/fix-linux-local-scriptnames 
filenames on Linux are case-sensitive
 2016-02-16 13:27:14 -08:00
Andrew Meadows
fd8073f6b5 init drawstatus to false 2016-02-16 12:11:19 -08:00
Andrew Meadows
492c026f78 Merge pull request #7102 from zzmp/fix/model-tex-revert 
Revert model texs when unset
 2016-02-16 09:25:40 -08:00
Chris Collins
ad6b563130 Merge pull request #7116 from samcake/red 
Fixing the rendering of the avatar skeleton
 2016-02-16 09:22:20 -08:00
Andrew Meadows
3160776d65 Merge pull request #7089 from zzmp/fix/overlay-property-scene-updates 
Update the scene on overlay3d updates
 2016-02-16 09:21:57 -08:00
Seth Alves
164d5d9c7e try, try again 2016-02-16 01:13:37 -08:00
Seth Alves
f2c9bbc32d filenames on Linux are case-sensitive 2016-02-16 00:39:54 -08:00
samcake
29bacd23df Fixing the rendering of the avatar skeleton 2016-02-15 18:56:46 -08:00
Anthony Thibault
6eda7aac6a Merge pull request #7106 from AndrewMeadows/tighter-capsule 
tighter bounding capsule for avatars
 2016-02-15 17:16:43 -08:00
Zach Pomerantz
5d1aedf707 Update scene items on overlay3d edits 2016-02-15 13:05:19 -08:00
Zach Pomerantz
01309ffd5f Add resort for scene item keys 2016-02-15 13:02:29 -08:00
Zach Pomerantz
0e9d696859 Cache renderable model orig texs as QVariantMap 2016-02-15 11:09:10 -08:00
samcake
0c0089f736 REnamed Octree.h/cpp to SpatialTree and fixing some coding guidelines 2016-02-15 11:08:12 -08:00
Andrew Meadows
d6a716a1aa only head and torso for bounding capsule radius 2016-02-15 10:29:29 -08:00
samcake
545f276fdf Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-15 09:29:00 -08:00
Brad Davis
b5cba79f0c Merge pull request #7095 from ZappoMan/hmdHacking 
Various bug fixes in related to HMD overlay support
 2016-02-12 17:50:42 -08:00
Brad Hefta-Gaub
e003fe5f4b Merge pull request #7081 from zzmp/fix/mini-mirror-ao 
Disable AO in mini mirror
 2016-02-12 17:37:45 -08:00
Andrew Meadows
6baf181453 Merge pull request #7093 from hyperlogic/tony/input-poses-in-avatar-space 
Controller Pose values are relative to Avatar.
 2016-02-12 17:13:36 -08:00
Brad Hefta-Gaub
d85a8a4fb9 Merge pull request #7103 from jherico/render-rate 
Don't drop to half the vsync rate when we can't keep up
 2016-02-12 17:11:03 -08:00
samcake
21c9b74a68 Cleaning up performance timers which are taking too much time... 2016-02-12 17:07:53 -08:00
samcake
bcd7876f6c adding better performance stats 2016-02-12 16:53:24 -08:00
Andrew Meadows
33d49fecaf Merge pull request #7085 from kencooke/master 
Added AVX detection for Mac/Linux
 2016-02-12 16:50:36 -08:00
Chris Collins
8317914070 Merge pull request #7097 from jherico/menuCleanup 
Don't leave user data pointers around in objects after deletion
 2016-02-12 16:12:20 -08:00
Brad Hefta-Gaub
1c2096bc30 remove some unrelated whitespace changes 2016-02-12 16:09:51 -08:00
Brad Davis
908e153c36 Don't drop to half the vsync rate when we can't keep up 2016-02-12 15:57:27 -08:00
Zach Pomerantz
0903e14b06 Revert model texs when unset 2016-02-12 15:57:24 -08:00
Eric Levin
921674b952 Merge pull request #7101 from ZappoMan/fixDoublePreload 
fix error in preload logic
 2016-02-12 15:35:59 -08:00
Brad Hefta-Gaub
98aaf02030 Merge pull request #7098 from zzmp/fix/model-texture-delta 
Update NetworkMaterial maps when changing textures
 2016-02-12 15:16:17 -08:00
Brad Hefta-Gaub
9160758af7 make sure forced reload still works 2016-02-12 15:09:50 -08:00
samcake
e3307d91ad Fix the debugging tool to be able to freeze the frustum for scene fetch and culling 2016-02-12 14:59:43 -08:00
Brad Hefta-Gaub
550b9a98b1 fix error in preload logic 2016-02-12 14:45:55 -08:00
Zach Pomerantz
d21f9d555a Update NetworkMaterial maps when changing textures 2016-02-12 12:37:07 -08:00
Brad Davis
28f3e8ba9c Don't leave user data pointers around in objects after deletion 2016-02-12 12:07:23 -08:00
Anthony Thibault
7d400623be Merge pull request #7096 from howard-stearns/fix-lookAt 
Fix Quat.lookAt
 2016-02-12 12:01:19 -08:00
samcake
9bfeb4a1d5 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 11:31:47 -08:00
samcake
c4faa091a1 Fixing initialization syntax 2016-02-12 11:31:21 -08:00
Andrew Meadows
1e29faf365 Merge pull request #7090 from ZappoMan/fixOctreeBag 
move back to unordered_set so that OctreeElementBag will handle uniqueness
 2016-02-12 11:22:46 -08:00
Brad Hefta-Gaub
1160ecb335 improvements in HMD UI behavior 2016-02-12 10:51:33 -08:00
samcake
ef92a52777 Merge pull request #7051 from zzmp/feat/graphics-dialog 
Move graphics settings to a new dialog
 2016-02-12 10:46:00 -08:00
Howard Stearns
80baa5ce18 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-lookAt 2016-02-12 10:39:31 -08:00
Howard Stearns
874f74de04 Fix Quat.lookAt 2016-02-12 10:38:50 -08:00
samcake
2d33bb83e1 Remove a dead comment 2016-02-12 10:30:44 -08:00
samcake
c248732bc7 Getting the array initialization right ? 2016-02-12 10:27:08 -08:00
samcake
40c283cba2 Fixing some warnings 2016-02-12 10:21:28 -08:00
samcake
40455af7fc LEss warning 2016-02-12 10:16:20 -08:00
samcake
5acfd5ff53 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 09:59:48 -08:00
samcake
171acb883f Fixing compilation issue on mac and linux 2016-02-12 09:59:33 -08:00
Seth Alves
5659589ea1 Merge pull request #7088 from birarda/offline-domain 
fix STUN failover for offline machines
 2016-02-12 09:16:20 -08:00
Zach Pomerantz
d516e9da78 Only run AO in DEFAULT_RENDER_MODE 2016-02-12 09:01:54 -08:00
Brad Hefta-Gaub
477dfe1b10 use std::unordered_map<> instead of std::unordered_set<> 2016-02-11 20:42:42 -08:00