Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-18 21:38:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28981 commits 25 branches 28 tags 1.2 GiB
Commit graph

28981 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
b95e4e1e93 Merge pull request #5323 from MarcelEdward/20605 
Removed the  line where the directory is stripped off the RelativeFile
 2015-07-30 07:30:01 -07:00
Marcel Verhagen
fa6d6a5123 Added the & references to the const variables 2015-07-30 15:08:02 +02:00
Brad Hefta-Gaub
398bace83c Merge pull request #5439 from samcake/punk 
Remove alias gl calls from Batch and Introduce a ResetStage Batch command
 2015-07-29 20:05:06 -07:00
Brad Hefta-Gaub
5a777b17a2 Merge pull request #5444 from huffman/fix-import-large-svo 
Fix issue with skyboxes not being importable from marketplace
 2015-07-29 18:34:55 -07:00
samcake
70d64a7777 Really fixing the depth write mask issue on clear... 2015-07-29 18:27:10 -07:00
Howard Stearns
84fd67ca7a Merge pull request #5460 from sethalves/obj-o-means-meshpart 
treat a "o" in an obj file as if it were a "g"
 2015-07-29 18:11:41 -07:00
samcake
e32e45ed2b make sure the writting mask is on for depth buffer 2015-07-29 18:06:46 -07:00
Seth Alves
b7ecffa0be treat a "g" in an obj file the same as a "o" 2015-07-29 17:55:56 -07:00
Eric Levin
0b1a36148e Merge pull request #5457 from howard-stearns/no-idle-hip-shifting 
Remove avatar->shift hips for idle animations.
 2015-07-29 17:50:08 -07:00
samcake
ac46b2bd17 Keep the resetstage in 2015-07-29 17:38:23 -07:00
Sam Gateau
8b7ad9cfcb merge with upstream 2015-07-29 17:13:48 -07:00
Sam Gateau
ab4b940d83 merge with upstream 2015-07-29 17:11:13 -07:00
Howard Stearns
838711e526 Remove avatar->shift hips for idle animations. 
See https://app.asana.com/0/32622044445063/43127903156601
 2015-07-29 15:27:50 -07:00
samcake
4ebc75da1f Merge pull request #5369 from ericrius1/hitEffect 
Added functionality for displaying a screen-space hit effect
 2015-07-29 11:28:08 -07:00
ericrius1
65e04337bf removed synccache line 2015-07-29 11:15:20 -07:00
Andrew Meadows
a1e6fdc4b2 Merge pull request #5435 from MarcelEdward/hifi-2-20069 
Hifi 2 20069
 2015-07-29 11:13:30 -07:00
ericrius1
697cb4c9d0 fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine 2015-07-29 10:02:06 -07:00
samcake
bc941147f4 Merge pull request #5446 from bwent/cookies 
Add cookies.js functionality for collapsable subpanels, key navigation
 2015-07-29 09:53:07 -07:00
bwent
7805cf4e48 Format fixes, UI logos for collapse/expand toggle 2015-07-29 09:19:33 -07:00
Marcel Verhagen
1d29fb9d7f replace tabs with whitespaces. 2015-07-29 14:56:24 +02:00
Brad Davis
6a5c2982ac Merge pull request #5453 from hyperlogic/ajt/mirror-anchor-fix 
Changed mirror position to not be achored to the head.
 2015-07-28 20:26:19 -07:00
Anthony J. Thibault
044ea2ace5 Changed mirror position to not be achored to the head. 
But instead it's anchored to the "default" eye position, which
is where the eyes are in the model, before IK or animations occur.
 2015-07-28 19:31:43 -07:00
samcake
9cf3dfd3f7 test this on windows ? 2015-07-28 15:49:39 -07:00
ericrius1
469bace7ca removed unnessary computations from hit effect fragment shader 2015-07-28 15:15:34 -07:00
Sam Gateau
df9b66d267 Implement the uniform buffer and resource texture cache and their reset 2015-07-28 15:08:52 -07:00
Andrew Meadows
fa49342f00 Merge pull request #5420 from bwent/solar-system 
Example script solarsystem.js with orbiting satellite game
 2015-07-28 15:06:23 -07:00
Howard Stearns
a383f43f75 Merge pull request #5447 from AndrewMeadows/calcium 
fix broken unit test builds
 2015-07-28 14:34:20 -07:00
Philip Rosedale
cce6f15de2 Merge pull request #5443 from huffman/edit-camera-up 
Update edit.js to swing up on activate so that it doesn't intersect with the avatar's head
 2015-07-28 13:32:34 -07:00
Ryan Huffman
0b25fc335e Cleanup edit.js entity creation 2015-07-28 13:21:29 -07:00
Marcel Verhagen
34d63cdb43 Removed double "" 2015-07-28 22:02:36 +02:00
bwent
1107742188 Clean up formatting for satellite.js 2015-07-28 13:01:20 -07:00
bwent
5272a1d6e7 refactoring variables and constants, fix update loop to continue over unlaunched satellites 2015-07-28 13:01:20 -07:00
bwent
e0d6609a99 resolve file path issue 2015-07-28 13:01:20 -07:00
bwent
ccb3d433af Example script solarsystem.js with orbiting satellite game 2015-07-28 13:01:20 -07:00
bwent
2be95997d1 clean up formatting 2015-07-28 13:00:41 -07:00
bwent
d9693796bc Capture key events 2015-07-28 13:00:40 -07:00
bwent
774b4851c3 Add tab to highlight widgets and update using left and right arrow keys 2015-07-28 13:00:40 -07:00
bwent
b7d195e817 more subpanel fixes 2015-07-28 13:00:40 -07:00
bwent
252780dc5d fix checkbox class, make subpanels collapsable 2015-07-28 13:00:40 -07:00
bwent
4ae03184ec add subpanel functionality 2015-07-28 13:00:40 -07:00
bwent
b46ad0c397 Created subpanel panel item 2015-07-28 13:00:40 -07:00
Andrew Meadows
d03a7d1b70 fix physics-tests build errors 2015-07-28 12:24:17 -07:00
Andrew Meadows
2aa453b610 fix build errors for shared-tests 2015-07-28 12:05:45 -07:00
Ryan Huffman
81e80996f7 Fix large marketplace imports not working 2015-07-28 11:24:33 -07:00
Sam Gateau
955b30ffd2 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-28 10:20:15 -07:00
Sam Gateau
22e70ee691 merged master 2015-07-28 10:13:05 -07:00
Andrew Meadows
6e41a79551 Merge pull request #5360 from BingShearer/Leaves 
New falling leaf script based on the existing rain.js
 2015-07-28 10:08:16 -07:00
Brad Hefta-Gaub
26111b9b80 Merge pull request #5365 from kevinmthomas-carpool/20485 
20485
 2015-07-28 09:59:43 -07:00
Brad Hefta-Gaub
43eec08514 Merge pull request #5376 from venkatn93/avatar 
New ambient occlusion effect in render pipeline
 2015-07-28 09:58:51 -07:00
Brad Hefta-Gaub
d8c2b41655 Merge pull request #5428 from kevinmthomas-carpool/20628 
CR for Job #20628 - JS Stream Player For Domain-Zone
 2015-07-28 09:58:04 -07:00