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

25581 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
2eb796eca6 resolve conflicts on merge with upstream/master 2015-05-18 10:25:24 -07:00
Stephen Birarda
1a1b304319 update METAVERSE_URL to correct url 2015-05-18 10:24:10 -07:00
Stephen Birarda
6c5626da43 save input on enter or act on table 2015-05-18 10:19:11 -07:00
Philip Rosedale
195a2d6de5 Merge pull request #4905 from AndrewMeadows/thermonuclear 
keep hockey paddle in playing field
 2015-05-18 09:54:57 -07:00
Andrew Meadows
257a730029 keep hokey paddle in playing field 2015-05-18 09:42:55 -07:00
Atlante45
9d27108acb Fix sourceUrl box in edit.js 2015-05-18 13:29:13 +02:00
Philip Rosedale
1f8008e5b5 Merge pull request #4897 from samcake/yellow 
Remove the loading time when moving to a zone
 2015-05-16 20:50:26 -07:00
Philip Rosedale
bf6d5af16d Merge pull request #4901 from AndrewMeadows/thermonuclear 
check for NULL before using pointer to EntityItem
 2015-05-16 18:33:00 -07:00
Andrew Meadows
180590145d check for NULL before using pointer to EntityItem 2015-05-16 11:12:19 -07:00
Eric Levin
03a4e08573 deleted unecsesary whitespace 2015-05-16 07:41:25 -07:00
Eric Levin
b6f1a1b89b added check to airhockey script so entities that have never been created are not attempting to be deleted 2015-05-16 07:34:32 -07:00
Stephen Birarda
bc0cb6105d fix sidebar badging for grouped values 2015-05-15 17:28:37 -07:00
Stephen Birarda
23378a79ab enable full auto networking for temporary name 2015-05-15 17:25:18 -07:00
Sam Cake
580339e99f Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-05-15 17:24:59 -07:00
Sam Cake
e9ff06df24 FIx the issue where the view frustum used in the skybox wasn;t in sync with the true camera, except if shadows is on, THe one call missing is now always executed 2015-05-15 17:22:29 -07:00
Stephen Birarda
9024f15d25 show description for existing domain selection 2015-05-15 17:19:22 -07:00
Philip Rosedale
36b396b9ef Merge pull request #4881 from ctrlaltdavid/fix-binary-eyelid 
Fix visibility of binary eyelid control menu item
 2015-05-15 17:19:15 -07:00
Philip Rosedale
831148e280 Merge pull request #4888 from sethalves/finglonger 
more pointer.js fixes
 2015-05-15 17:18:32 -07:00
Philip Rosedale
1c3873358d Merge pull request #4896 from huffman/update-web-icon 
Update web icon
 2015-05-15 17:18:11 -07:00
Philip Rosedale
534869a7ad Merge pull request #4889 from ericrius1/dice 
changed dice to use collisionSoundURL prop
 2015-05-15 17:17:45 -07:00
Philip Rosedale
0d00393eff Merge pull request #4854 from ctrlaltdavid/fix-facetracker-rotation 
Fix facetracker rotation
 2015-05-15 17:17:30 -07:00
Philip Rosedale
edf963ab8f Merge pull request #4895 from ericrius1/hockey 
Hockey
 2015-05-15 17:17:07 -07:00
Stephen Birarda
b8b5ff4aca fixes for temporary domain creation 2015-05-15 17:14:51 -07:00
Stephen Birarda
edf9042ed5 add hifi link to table, make table icons anchors 2015-05-15 17:12:19 -07:00
Nex Pro
75ddad7ec1 Added values for friction and restitution in the entity parameters. 2015-05-16 00:43:05 +01:00
Stephen Birarda
60a8dc1eb3 add initial version of places table in domain-server 2015-05-15 16:33:12 -07:00
Ryan Huffman
a0369d243a Update web icon 2015-05-15 15:58:02 -07:00
Eric Levin
9bfca7f54d 'moved icons up so they don't interfere with dice icons and changed spanw icon from dice to puck icon' 
'
 2015-05-15 15:43:23 -07:00
Sam Cake
c3dfd574b4 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-05-15 15:27:14 -07:00
Sam Cake
07fe43e175 moving forward with the void* hack for gpu::Texture 2015-05-15 15:26:40 -07:00
Eric Levin
6e1c5d704c 'modified airHockey script to be able to spawn and delete using buttons, added light flashing on score, and puck now respawns on player's side who just got scored on 2015-05-15 15:24:10 -07:00
Stephen Birarda
7caaa757fd change paths label to places/paths 2015-05-15 14:51:53 -07:00
Atlante45
407d1bd013 Merge branch 'master' of https://github.com/highfidelity/hifi into warings 2015-05-15 23:27:04 +02:00
Seth Alves
60bd345e57 shorter timeout 2015-05-15 14:20:29 -07:00
Seth Alves
0d3add8596 left mouse button only 2015-05-15 14:16:06 -07:00
Seth Alves
aeb5cead65 more fixes to pointer.js 2015-05-15 14:02:25 -07:00
Eric Levin
9c6be26290 changed dice to use collisionSoundURL prop 2015-05-15 13:55:48 -07:00
Seth Alves
042713d1ec Merge branch 'master' of github.com:highfidelity/hifi into finglonger 2015-05-15 13:55:28 -07:00
Seth Alves
f535bd2a76 more fixes to pointer.js 2015-05-15 13:54:24 -07:00
Philip Rosedale
650e8a54af Merge pull request #4879 from jherico/hmd_pick 
Fix mouse picking in the HMD
 2015-05-15 13:50:54 -07:00
Seth Alves
de8d06acf6 Merge pull request #4887 from PhilipRosedale/hockeygame 
remove line pointers from grab and hockey grab
 2015-05-15 13:43:55 -07:00
Philip Rosedale
36031eb308 Merge pull request #4886 from sethalves/finglonger 
rays never pick a line entity.  some fixes to pointer.js
 2015-05-15 13:27:13 -07:00
Philip Rosedale
cb0112e14e remove line pointers from grab and hockey grab 2015-05-15 13:21:58 -07:00
Stephen Birarda
bfa069a26b handle domain ID removal and account disconnection 2015-05-15 13:15:09 -07:00
Seth Alves
09f900862b Merge branch 'master' of github.com:highfidelity/hifi into finglonger 2015-05-15 13:14:06 -07:00
Stephen Birarda
a675b0a891 fix locked link button in settings 2015-05-15 13:10:32 -07:00
Seth Alves
bb3d1a6a58 rays never pick a line entity. some fixes to pointer.js 2015-05-15 13:10:16 -07:00
Atlante45
940363bf2e Fix activeRendernigThread check 2015-05-15 21:36:37 +02:00
Atlante45
cb02ef9277 Remove warnings 2015-05-15 21:35:47 +02:00
Sam Cake
97b18fcd52 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-05-15 11:29:43 -07:00