Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 15:14:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25737 commits 71 branches 56 tags 1.2 GiB
Commit graph

25737 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
1bb682180c workaround for segregateMeshGroups() crash 2015-05-18 12:24:18 -07:00
Philip Rosedale
925ef1d930 Merge pull request #4909 from sethalves/airhockey-hull 
airhockey -- use a collision hull for table.  make deletion code safer
 2015-05-18 12:23:27 -07:00
Seth Alves
e2a39b4597 airhockey -- drop from slightly lower so paddle doesn't flip over. update grab script with new table name 2015-05-18 12:18:27 -07:00
Seth Alves
6d9db21d88 Merge branch 'master' of github.com:highfidelity/hifi into airhockey-hull 2015-05-18 12:09:10 -07:00
Seth Alves
5ea506f2c1 use a collision hull for table. make deletion code safer 2015-05-18 11:47:06 -07:00
Clément Brisset
4534dbe686 Merge pull request #4907 from birarda/domain-wizard 
new domain setup flow in domain-server settings
 2015-05-18 20:20:25 +02:00
Stephen Birarda
b5fb8b0d12 Merge pull request #4908 from howard-stearns/edit-script-type 
Fix (long-standing?) typo in edit.js file reference.
 2015-05-18 13:37:45 -04:00
Howard Stearns
adfe21b743 Fix (long-standing?) typo in edit.js file reference. 2015-05-18 10:28:47 -07:00
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
e67622d219 Merge branch 'team-teaching' into remove_gl_transform 2015-05-18 17:42:09 +02:00
Brad Hefta-Gaub
1923eab93f Merge pull request #4903 from highfidelity/master 
Update team-teaching branch
 2015-05-18 08:25:27 -07:00
Atlante45
a9a0c9f387 Render 3D overlays before entities 
This gets rid of some issues due to entities moving to render pipeline
 2015-05-18 17:13:32 +02:00
Atlante45
a7ee10001a Remove used deprecated methods 
Also added a warning on the single one in use right now,
so that it gets deleted once it is moved to the rendering pipeline
 2015-05-18 16:37:28 +02:00
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