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

24567 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
e6da5ea711 formatting 2015-04-28 09:28:42 -07:00
Andrew Meadows
e646ff6847 Merge pull request #4708 from ctrlaltdavid/fix-audio-mouth 
Fix audio-driven mouth viewed by others
 2015-04-28 09:28:22 -07:00
Seth Alves
49783c1550 formatting 2015-04-28 09:28:17 -07:00
Seth Alves
7aa2013473 formatting 2015-04-28 09:26:39 -07:00
Seth Alves
436fe03d10 formatting 2015-04-28 09:26:20 -07:00
Seth Alves
30e78a37cd formatting 2015-04-28 09:26:03 -07:00
Seth Alves
a1da96e971 formatting 2015-04-28 09:23:30 -07:00
Seth Alves
dc0b033101 formatting 2015-04-28 09:23:19 -07:00
Seth Alves
eb36bf3aa0 formatting 2015-04-28 09:23:00 -07:00
Seth Alves
be8764424e formatting 2015-04-28 09:20:38 -07:00
Seth Alves
8db46d859e formatting 2015-04-28 09:19:45 -07:00
Seth Alves
38ba0ab352 remove useless added code 2015-04-28 09:18:00 -07:00
Atlante45
ab9d81b5e2 Correct comments 2015-04-28 18:09:09 +02:00
Atlante45
fe0bd456e1 Zones now use Models instead of FBXGeometries 2015-04-28 17:07:40 +02:00
Atlante45
b7263eeacf Added a more efficient convexHullContains to Model 
New version computes each submesh's bounding box once and checks against it
before checking against triangles.
 2015-04-28 17:05:38 +02:00
Atlante45
4911aa58bc Fix Model setURL with delayload 
Without this condition the model stays in a state where the geometry
  is downloaded but not referenced
That way, another call to setURL with update the geometry reference
instead of returning.
 2015-04-28 17:02:32 +02:00
Clément Brisset
bc8f6708b6 Merge pull request #4698 from ctrlaltdavid/fps-facetracker 
Facetracker FPS refactor
 2015-04-28 14:04:17 +02:00
Brad Davis
f49f37ac89 Merge pull request #4670 from thoys/fix-run_one_interface_per_user 
Multiple instances of interface on Windows (one per user)
 2015-04-28 01:22:21 -07:00
Brad Davis
c685874b05 Merge pull request #4705 from birarda/avatar-mixer-throttling 
add macro to recursively correctly handle OS X bundle resources
 2015-04-28 01:19:36 -07:00
Brad Davis
b4e9dbedbc Merge remote-tracking branch 'upstream/master' into vr_menus 2015-04-28 00:28:57 -07:00
Brad Davis
d1d1830b2f Importing peferred dialog look from browser branch 2015-04-28 00:26:24 -07:00
samcake
1acd27db08 Merge pull request #4709 from jherico/resources 
Removing debug hack to load resources from source folder
 2015-04-27 23:42:45 -07:00
Brad Davis
897e47e8e6 Removing debug hack to load resources from source folder 2015-04-27 23:17:56 -07:00
Brad Davis
b0eccc40c2 Fix crash cause when Menu::instance() is before offscreen ui startup 2015-04-27 22:58:09 -07:00
David Rowe
d6eb04c3b0 Fix audio-driven mouth viewed by others 2015-04-27 21:43:57 -07:00
Brad Hefta-Gaub
086abe8468 Merge pull request #4707 from sethalves/dont-rez-if-no-rez-rights 
don't create entities in local tree if the entity-serer isn't going to accept them.
 2015-04-27 20:33:03 -07:00
Brad Davis
19ca543c2c Cleaning up code and tweaking menu layout 2015-04-27 19:07:53 -07:00
Seth Alves
6f441e3490 if our Node isn't allowed to create entities in this domain, don't try. 2015-04-27 19:07:53 -07:00
Brad Davis
10b5935063 Let QML take care of more of the height/width stuff 2015-04-27 18:11:19 -07:00
Philip Rosedale
5fad6b97ff Merge pull request #4706 from ZappoMan/useAvatarCrashFix 
fix crash in scripts using useAvatar methods
 2015-04-27 17:10:10 -07:00
ZappoMan
62a421361c fix crash in scripts using useAvatar methods 2015-04-27 16:58:34 -07:00
Seth Alves
e48552f243 Merge pull request #4702 from AndrewMeadows/thermonuclear 
PhysicsEngine cleanup in preparation for colliding avatars
 2015-04-27 16:20:27 -07:00
Seth Alves
1fb40652f1 Merge pull request #4699 from jherico/build-notes 
Updating the build notes to refelect the new Qt version requirement
 2015-04-27 16:18:36 -07:00
Stephen Birarda
ec2f54b90a add a macro to recursively correctly handle resources 2015-04-27 16:02:52 -07:00
Brad Davis
59b8b80148 Merge remote-tracking branch 'upstream/master' into vr_menus 
Conflicts:
	interface/src/Menu.cpp
 2015-04-27 16:02:13 -07:00
Brad Davis
1beaf18d1b Prevent the login dialog from spawning the address bar on enter keys 2015-04-27 16:00:23 -07:00
Seth Alves
d22ca6a390 Merge pull request #4703 from ZappoMan/rootEntitiesBugFix 
fix bug in parsing root element data
 2015-04-27 15:52:04 -07:00
Seth Alves
32f91a86e7 remove some unneeded code 2015-04-27 15:43:47 -07:00
Brad Davis
fd28baac8c Working on message box and addressbar tweaks 2015-04-27 15:42:20 -07:00
Seth Alves
2f36cd0fb0 make it so assignment-clients runnings scripts can rez entities 2015-04-27 15:30:17 -07:00
ZappoMan
1ef58139a4 fix bug in parsing root element data 2015-04-27 15:07:32 -07:00
Andrew Meadows
31e5758422 namechange updateObjectEasy()-->updateBodyEasy() 2015-04-27 13:04:59 -07:00
Andrew Meadows
72deb2e49b merge upstream/master into andrew/thermonuclear 
Conflicts:
	libraries/entities/src/EntityItem.h
	libraries/physics/src/EntityMotionState.cpp
 2015-04-27 12:54:21 -07:00
Bradley Austin Davis
ca16d37ce5 Mac testing 2015-04-27 12:46:34 -07:00
Andrew Meadows
c097a0038a Merge pull request #4685 from sethalves/detect-ballistic 
various physics-related experiments
 2015-04-27 12:41:50 -07:00
Seth Alves
bdc6bb3c2d Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-27 12:20:58 -07:00
Seth Alves
2e5049a190 fix bug caused by no-longer reusing a variable 2015-04-27 12:20:01 -07:00
Brad Davis
76ce34a74b Scanning for code style 2015-04-27 11:41:10 -07:00
Brad Davis
d55d467d3f Tweaking VR menu for PR 2015-04-27 11:35:57 -07:00
Brad Hefta-Gaub
90c47a6046 Merge pull request #4695 from jherico/ui-refactor 
New UI library, some bug fixes and features
 2015-04-27 11:16:10 -07:00