Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:33:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23305 commits 71 branches 56 tags 1.2 GiB
Commit graph

23305 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
c90ca4b425 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-16 12:13:26 -07:00
Seth Alves
fe658c0ed0 diff minimization 2015-03-16 12:13:16 -07:00
Seth Alves
5bc2d88ea6 diff minimization 2015-03-16 12:11:41 -07:00
Seth Alves
999324bcaf remove unused code 2015-03-16 12:06:27 -07:00
Seth Alves
1e50d94384 don't put arbitrarily large array on stack 2015-03-16 11:59:30 -07:00
Seth Alves
2d4a95c634 move to-map recurse operator class to its own file 2015-03-16 11:54:50 -07:00
Seth Alves
109271de3d remove unused constant 2015-03-16 11:54:06 -07:00
Seth Alves
ecb958687d don't crash if we encounter an unknown shape type 2015-03-16 11:53:47 -07:00
Andrew Meadows
e18d9fd81c Merge pull request #4452 from sethalves/obj-reader-fixes 
Obj reader fixes
 2015-03-16 11:35:51 -07:00
Andrew Meadows
fa27b76183 Merge pull request #4442 from Atlante45/edit_entities_box_selection 
editEntities - select all in/touching box
 2015-03-16 11:33:35 -07:00
Seth Alves
08cb13640c debugging spew 2015-03-16 11:22:42 -07:00
ZappoMan
7ddd54b782 dont report deleteEntity warnings in client for delete messages coming back from server 2015-03-16 11:11:07 -07:00
Stephen Birarda
a874f933c6 go to sandbox if location not present in settings 2015-03-16 11:00:04 -07:00
Seth Alves
a2bc34ced9 fix attempt to avoid normalizing a zero length vector, other adjustments to respond to code review 2015-03-16 10:03:55 -07:00
Andrew Meadows
510bcb4488 Merge pull request #4453 from sethalves/quiet-some-warnings 
Quiet some warnings
 2015-03-16 09:31:14 -07:00
Seth Alves
32c79f6172 bounce json's QVariants through QScripts before making them into properties, in order to take advantage of existing conversion code 2015-03-16 09:17:32 -07:00
Atlante45
c421adaf58 Fix unresolve merge conflict 2015-03-16 16:27:33 +01:00
Atlante45
a9ed09a742 Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection 2015-03-16 15:53:59 +01:00
Clément Brisset
468b62e536 Merge pull request #4451 from sethalves/linux-tools-window-freakout 
don't autohide tools window on Linux
 2015-03-16 07:41:52 -07:00
Atlante45
c6167f6893 CR 2015-03-16 14:35:17 +01:00
Atlante45
ad16f49d01 Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection 2015-03-16 14:28:24 +01:00
Clément Brisset
dfd39ca1e1 Merge pull request #4448 from huffman/loading-image 
Add hourglass image to loading svo overlay
 2015-03-16 06:25:41 -07:00
Clément Brisset
934d9c087a Merge pull request #4447 from ctrlaltdavid/20394 
CR for Job #20394 - Build friends.js v1
 2015-03-16 06:24:35 -07:00
Atlante45
c5010c4d55 Hide cursor at MainWindow level when in VRMode 2015-03-16 14:19:24 +01:00
Seth Alves
806280f9cc Merge branch 'linux-tools-window-freakout' of github.com:sethalves/hifi into persist-entities-as-json 2015-03-15 09:00:24 -07:00
Seth Alves
bd85179d82 suppress a compiler warning 2015-03-15 08:24:59 -07:00
Seth Alves
af10c2274b remove stray carriage returns 2015-03-15 08:24:49 -07:00
Seth Alves
019ea55d24 minimize diff 2015-03-15 08:21:57 -07:00
Seth Alves
d074cec135 fix obj writer in vhacd util 2015-03-15 08:14:25 -07:00
Seth Alves
b15fd2ef94 compatibility and other fixes for obj reader 2015-03-15 08:08:39 -07:00
Seth Alves
bfa38521ed linux desktops are often configured as point-to-focus. don't autohide tools window on linux 2015-03-15 07:59:32 -07:00
Seth Alves
6c4b808813 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-15 07:10:56 -07:00
Seth Alves
59e4efa651 debugging prints around a deadlock 2015-03-15 07:10:43 -07:00
Seth Alves
250567e315 formatting, diff minimization 2015-03-14 12:09:23 -07:00
Seth Alves
6b49b0ed7d formatting 2015-03-14 11:58:53 -07:00
Seth Alves
a58f0fe76e remove cruft, formatting 2015-03-14 11:57:08 -07:00
Seth Alves
0c803cd82b fix up obj reader and writer 2015-03-14 11:50:16 -07:00
David Rowe
08c95555dd Calculate head height based on model mesh rather than joints 
This fixes the problem of some head models having display names
rendering through them.
 2015-03-14 09:47:47 -07:00
Seth Alves
833fb2e2f4 obj file handles faces of the form 1/2/3 2015-03-13 20:16:53 -07:00
Seth Alves
b815c365eb formatting 2015-03-13 18:57:27 -07:00
Seth Alves
f7f75cabf4 formatting 2015-03-13 18:49:48 -07:00
Leonardo Murillo
d6bf0f3bec Merge pull request #4450 from birarda/master 
some & squishes missed in review, metaverse user-agent fix
 2015-03-13 19:48:59 -06:00
Seth Alves
87cc710efc more merge madness, calculate 2nd PhysicsEngine hash with qChecksum if url is set 2015-03-13 18:43:24 -07:00
Seth Alves
d749b350eb still recovering from troubled merge 2015-03-13 18:29:59 -07:00
Stephen Birarda
9d055f81f4 use a Mozilla user agent for mod security 2015-03-13 18:29:55 -07:00
Stephen Birarda
9f7ed7b12a update user agent to be HighFidelityInterface 2015-03-13 18:28:09 -07:00
Seth Alves
a5cdc3c68b still recovering from troubled merge 2015-03-13 18:27:52 -07:00
Seth Alves
c24ea023f6 still recovering from troubled merge 2015-03-13 18:26:09 -07:00
Stephen Birarda
dcff4f5956 use HIGH_FIDELITY_USER_AGENT for DataWebPage 2015-03-13 18:25:17 -07:00
Seth Alves
af2c00b235 still recovering from troubled merge 2015-03-13 18:21:59 -07:00