Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 08:58:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25619 commits 74 branches 59 tags 1.2 GiB
Commit graph

25619 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
c847de0a2e Missing batch args 2015-05-18 16:37:00 +02:00
Atlante45
72bf160845 Proxies render in Batch 2015-05-18 16:36:16 +02:00
Atlante45
16e6f76028 Improve init/killInput 
Added glPush/PopClientAttrib() calls
Overrites _input._attributeActivation with the correct values
 2015-05-18 15:47:57 +02:00
Atlante45
25579a632c Merge branch 'fix_source_url' into remove_gl_transform 2015-05-18 13:38:50 +02:00
Atlante45
9d27108acb Fix sourceUrl box in edit.js 2015-05-18 13:29:13 +02:00
Atlante45
ede94e4248 Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform 2015-05-18 11:39:17 +02:00
Brad Hefta-Gaub
d15379a6e9 Merge pull request #4894 from huffman/batch-param 
Batch parameters in GeometryCache
 2015-05-17 13:42:08 -07:00
Atlante45
802e963bba Debug entity render in batch 
Also removed unnecessary glPush/Pop
 2015-05-17 12:42:14 +02:00
Atlante45
16340c0fee LightEntity debug render in batch 2015-05-17 12:31:14 +02:00
Atlante45
38d3c85664 ZoneEntity wireframes render in batch 2015-05-17 12:21:14 +02:00
Atlante45
58460eb4ba SphereEntity render in batch 2015-05-17 12:20:52 +02:00
Atlante45
0156ef1700 LineEntity render in batch 2015-05-17 12:20:37 +02:00
Atlante45
d99d005b3b Merge branch 'huffman-batch-param' into remove_gl_transform 2015-05-17 12:04:05 +02:00
Atlante45
4bbc5de39d Remove "raw" gl calls 
Removed calls to batch._gl*
Added init/killInput in glBackend ctor/dtor
	This will disable client states and set buffers to 0
 2015-05-17 11:58:39 +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
Atlante45
dfaa4ab1a3 BoxEntity render in Batch 2015-05-16 05:45:27 +02:00
Atlante45
3436658e45 Add batch to RenderAgrs 2015-05-16 05:42:26 +02:00
Atlante45
4725d5e676 Merge branch 'primitives_batch' into remove_gl_transform 2015-05-16 05:22:12 +02:00
Atlante45
7185589407 Add optional Batch to RenderArgs 2015-05-16 04:42:15 +02:00
Atlante45
5746607878 Merge branch 'huffman-batch-param' into primitives_batch 2015-05-16 04:37:22 +02:00
Atlante45
7ff973b94c Merge branch 'master' of https://github.com/highfidelity/hifi into primitives_batch 2015-05-16 04:36:05 +02:00
Atlante45
6e642ed040 Missing & 2015-05-16 04:32:20 +02:00
Atlante45
b8fffdb2ef bind/releaseSimpleProgram takes Batch 2015-05-16 04:26:57 +02:00
Atlante45
4bb1b1a02f TextureCache::setPrimaryDrawBuffers can take a Batch 2015-05-16 04:25:51 +02:00
Atlante45
b11525debf Add missing batch args 2015-05-16 04:03:46 +02:00
Atlante45
c220435364 Restore gl* calls but record them with batch 2015-05-16 04:01:08 +02:00
Atlante45
90935d550d Merge branch 'master' of https://github.com/highfidelity/hifi into huffman-batch-param 2015-05-16 02:42:57 +02: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