Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 09:23:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22660 commits 76 branches 59 tags 1.2 GiB
Commit graph

22660 commits

This branch
This branch
All branches
Author SHA1 Message Date
Virendra Singh
4627d2e7b5 Parallel axis theorem correction 2015-03-04 03:52:59 +05:30
Virendra Singh
1914661bbf Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-04 03:51:06 +05:30
Brad Hefta-Gaub
b118912708 Merge pull request #4361 from samcake/temp0 
evolve the Transform stack away from the legacy GL to the brand new shader way
 2015-03-03 11:43:01 -08:00
Virendra Singh
7a129235c2 Mass properties unit tests 2015-03-04 01:12:20 +05:30
Virendra Singh
cd71f4531d Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-04 01:10:52 +05:30
Andrew Meadows
128eb1c48e Merge pull request #4346 from birarda/master 
handle bullet as multi-config on WIN32
 2015-03-03 11:30:52 -08:00
Brad Hefta-Gaub
29340b6586 Merge pull request #4369 from ctrlaltdavid/20370 
CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361
 2015-03-03 11:17:31 -08:00
Sam Gateau
cad2184927 FIxing the compilation issue for linux 2015-03-03 11:09:11 -08:00
Brad Hefta-Gaub
b88d52a310 Merge pull request #4363 from huffman/block-restricted-users 
Add permission-checking to edit entities
 2015-03-03 11:04:46 -08:00
Sam Gateau
598b791aee FIxing the compilation issue for linux 2015-03-03 11:01:47 -08:00
Sam Gateau
4619ba1f5b Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-03 10:56:04 -08:00
Clément Brisset
774f54a26b Merge pull request #4352 from birarda/remove-prio 
remove PrioVR integration
 2015-03-03 10:47:02 -08:00
Stephen Birarda
eb8e8e9a62 Merge pull request #4356 from sethalves/domain-server-http-port-in-shmem 
pass more localhost ports via shared memory
 2015-03-03 10:05:24 -08:00
Stephen Birarda
5a601f3676 resolve conflicts on merge with upstream/master 2015-03-03 10:01:24 -08:00
Clément Brisset
5ef86f88f5 Merge pull request #4364 from huffman/save-on-blur 
Fix properties window changes not taking affect when losing focus
 2015-03-03 08:35:49 -08:00
Philip Rosedale
c9f97b312e Merge pull request #4365 from sethalves/log-only-once 
Log message type just once
 2015-03-02 20:38:54 -08:00
Ryan Huffman
b370e025c9 Move EntityScriptingInterface instance to DependencyManager 2015-03-02 15:05:31 -08:00
Ryan Huffman
98e0f235cc Merge branch 'master' of git://github.com/highfidelity/hifi into block-restricted-users 2015-03-02 14:47:26 -08:00
Seth Alves
bb7b132b78 Add a way to indicate that a specific message of a certain form should only be printed once. Different messages that match the same form will each be printed once. 2015-03-02 14:18:26 -08:00
Brad Hefta-Gaub
6d8ccfbc2a Merge pull request #4357 from huffman/update-light-entity-properties 
Update light entity properties
 2015-03-02 13:51:48 -08:00
Virendra Singh
3d558dae64 MassProperties of a 3D mesh 2015-03-03 01:51:35 +05:30
Ryan Huffman
38a361dcf0 Remove class scope on _entityScriptingInterface property references 2015-03-02 11:32:07 -08:00
Ryan Huffman
f739bf2116 Fix properties window changes not taking affect when losing focus 2015-03-02 11:20:00 -08:00
Ryan Huffman
75a943386b Remove nullptr comparison 2015-03-02 10:44:32 -08:00
Ryan Huffman
26e3b331ee Update editEntities.js lock checking to use event instead of polling 2015-03-02 10:42:09 -08:00
Ryan Huffman
a443157dd7 Update ScriptEngine::entityScriptingInterface to be static pointer 
Statically allocating the EntityScriptingInterface means we can't make
sure it is initialized AFTER NodeList has been initialized
 2015-03-02 10:40:46 -08:00
Ryan Huffman
9a302eebed Add Entities.canAdjustLocksChanged 2015-03-02 10:40:29 -08:00
Ryan Huffman
64cb517856 Add LimitedNodeList::canAdjustLocksChanged signal 2015-03-02 10:40:11 -08:00
Ryan Huffman
0638459052 Add permission-checking to edit entities 2015-03-02 09:51:41 -08:00
Ryan Huffman
1a3eb68e2d Update lightEntityItem old version handling to be more clear 2015-03-02 09:25:18 -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
Sam Gateau
5652852d1a Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-27 17:35:59 -08:00
Sam Gateau
f92efa13c8 fix typo 2015-02-27 17:35:08 -08:00
Sam Gateau
5ab3cbb7ec Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated 2015-02-27 17:11:16 -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
Ryan Huffman
84691f922c Remove old light color properties 2015-02-27 14:04:56 -08:00
Ryan Huffman
61bc32493f Fix entity version name in LightEntityItem 2015-02-27 13:49:17 -08:00