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
22572 commits 71 branches 56 tags 1.2 GiB
Commit graph

22572 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
0638459052 Add permission-checking to edit entities 2015-03-02 09:51:41 -08:00
Philip Rosedale
9af30a268c Merge pull request #4362 from ZappoMan/fpsImprovements 
Some Stats cleanup and minor FPS improvements
 2015-03-01 22:29:18 -08:00
Brad Hefta-Gaub
f1f0878a3f Merge pull request #4359 from huffman/fix-rotation-text 
Update editEntities handles
 2015-02-27 22:14:40 -08:00
Brad Hefta-Gaub
a2d8f89426 Merge pull request #4358 from huffman/handle-sigint 
Add SIGINT handling to assignment-client
 2015-02-27 22:13:10 -08:00
ZappoMan
a338d96b9d only render the overlay if we're actually rendering the overlay 2015-02-27 18:00:51 -08:00
ZappoMan
9cc66f3da7 cleanup stats display behavior, reset default settings for timing details 2015-02-27 17:57:42 -08:00
Philip Rosedale
d123ad5b76 Merge pull request #4360 from ZappoMan/transparentRAWheightmaps 
add support for transparency in RAW heightmaps
 2015-02-27 16:39:39 -08:00
ZappoMan
31c96523fb add support for transparency in RAW heightmaps 2015-02-27 15:57:46 -08:00
Ryan Huffman
a48c428f42 Update highlighted handle color 2015-02-27 15:29:00 -08:00
Ryan Huffman
dc2cb93cce Add degrees symbol to rotation degrees text 2015-02-27 15:11:43 -08:00
Ryan Huffman
a0d9e92c64 Update size of rotation overlay 2015-02-27 15:11:23 -08:00
Ryan Huffman
4f4ab144b2 Update handle colors and up/down arrow image 2015-02-27 15:10:56 -08:00
Ryan Huffman
cd3281521c Update size of rotation degrees text 2015-02-27 15:08:29 -08:00
Ryan Huffman
3ffd47a0b0 Update editEntities rotation arrows 2015-02-27 15:08:13 -08:00
Philip Rosedale
af9108c79f Merge pull request #4338 from ctrlaltdavid/20368 
DO NOT MERGE - QA for 20368
 2015-02-27 14:16:55 -08:00
Ryan Huffman
11efcd70d8 Add SIGINT handling to assignment-client 2015-02-27 14:09:46 -08:00
Philip Rosedale
9eee213bce Merge pull request #4353 from Atlante45/relax_face_tracker 
Relax blendshapes
 2015-02-27 13:36:22 -08:00
David Rowe
797b1649a6 Merge branch 'master' into 20368 
Conflicts:
	interface/src/devices/DdeFaceTracker.cpp
 2015-02-27 12:48:21 -08:00
Philip Rosedale
7f915fbe79 Merge pull request #4354 from sethalves/assignment-client-dont-spam-log 
add suppressions for log-spam caused by idle assignment-client
 2015-02-27 11:26:29 -08:00
Seth Alves
01cac7445a add suppressions for log-spam caused by idle assignment-client 2015-02-27 10:58:04 -08:00
Brad Hefta-Gaub
addc729654 Merge pull request #4350 from huffman/multi-select 
Multi select properties for edit entities
 2015-02-27 10:54:42 -08:00
Brad Hefta-Gaub
08dc883b0e Merge pull request #4351 from huffman/update-light-properties 
Update light properties (primarily for editEntities.js)
 2015-02-27 10:54:19 -08:00
Brad Hefta-Gaub
e78b2ced4a Merge pull request #4349 from huffman/no-nearby-entities-msg 
Add message to edit entities list for when no entities are nearby
 2015-02-27 10:53:17 -08:00
Philip Rosedale
35205fbbf3 Merge pull request #4347 from samcake/temp1 
Introducing the SunSkyStage
 2015-02-27 10:37:02 -08:00
Atlante45
fa8e1549f6 Relax blendshapes 2015-02-27 19:33:01 +01:00
Philip Rosedale
1663fcb489 Merge pull request #4348 from Atlante45/relax_face_tracker 
Relax face tracker
 2015-02-27 08:37:49 -08:00
Philip Rosedale
df553ac65e Merge pull request #4335 from sethalves/assignment-client-keep-a-spare-x 
Assignment client keep a spare
 2015-02-27 07:39:06 -08:00
Atlante45
db90fcdb62 Simplify expression 2015-02-27 16:09:15 +01:00
Atlante45
8615bb7cff Make relaxation go to EPSILON within TIME 2015-02-27 15:58:28 +01:00
Atlante45
9849efe013 Exponential relaxation 2015-02-27 15:33:24 +01:00
Sam Gateau
c7eeebe52c and fixing a bug with shadowing of lightmapped surface 2015-02-26 18:07:43 -08:00
Sam Gateau
74f0d98fd6 REfining the naming and introducing an orientation offset 2015-02-26 17:44:04 -08:00
Seth Alves
b8322556a6 address code-review comments 2015-02-26 17:34:24 -08:00
Sam Gateau
f6a9bd1870 REfining the naming and introducing an orientation offset 2015-02-26 17:26:41 -08:00
Seth Alves
c80995170a -n and -t are okay together 2015-02-26 17:17:19 -08:00
Sam Gateau
e3b3c8e1ef Setting the defalt at a better time of the day 2015-02-26 16:09:21 -08:00
Ryan Huffman
d60618a582 Remove unused variables from RenderableLightEntityItem::render 2015-02-26 14:58:06 -08:00
Ryan Huffman
dc2b670fa8 Remove extraneous comments 2015-02-26 14:46:05 -08:00
Ryan Huffman
74bc48ce55 Add message to edit entities list for when no entities are nearby 2015-02-26 14:34:32 -08:00
Ryan Huffman
ecc003c5e1 Adjust colors for disabled input elements 2015-02-26 14:23:25 -08:00
Ryan Huffman
3c5f11e6ed Add initial support for multi-selection in properties window 2015-02-26 14:23:11 -08:00
Andrew Meadows
375255f22e Merge pull request #4345 from virneo/20305 
CR for Job #20305 - Physics: V-HACD convex decomposition utilities
 2015-02-26 13:24:49 -08:00
Sam Gateau
96d5a2ab42 fixing tab maybe 2015-02-26 12:10:08 -08:00
Sam Gateau
bc8d688cde fixing tab maybe 2015-02-26 12:04:33 -08:00
Sam Gateau
e77d4572fa Merge branch 'temp1' of https://github.com/samcake/hifi into temp1 2015-02-26 12:03:39 -08:00
Virendra Singh
695cfb3397 VHACD dependency build instructions 2015-02-27 01:04:23 +05:30
Virendra Singh
d4367924ad Clean up coding standard violations 2015-02-27 00:59:59 +05:30
Virendra Singh
93106be466 VHACD dependency build instructions 2015-02-27 00:58:55 +05:30
dev
b04dbf7a34 fixing compilation issue on macos 2015-02-26 11:27:40 -08:00
Atlante45
5a556a06d2 Merge branch 'master' of https://github.com/highfidelity/hifi into relax_face_tracker 2015-02-26 20:06:20 +01:00