Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:35:32 +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
Seth Alves
32cc0eacfc improve a debug print 2015-05-22 15:21:26 -07:00
Brad Hefta-Gaub
ce613d4960 Merge pull request #4947 from samcake/punk 
Introducing the Engine and its Tasks
 2015-05-22 15:15:16 -07:00
Brad Hefta-Gaub
9e80dc9cc9 Merge pull request #4948 from ZappoMan/team-teaching 
TEAM TEACHING - update from master
 2015-05-22 15:14:45 -07:00
Seth Alves
53fe41ef4d improve a debug print 2015-05-22 15:11:56 -07:00
Seth Alves
945a84d24f adjust logic used by the entity-server to decide if the contents of an octree-element have already been sent to a particular interface with a particular frustum 2015-05-22 15:01:43 -07:00
ZappoMan
160898ce96 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-22 14:55:29 -07:00
Sam Gateau
a28c99bb40 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-22 14:40:00 -07:00
Brad Hefta-Gaub
dec1686228 Merge pull request #4943 from Atlante45/simple_program 
TEAM TEACHING - Simple program uses transform stack
 2015-05-22 14:39:13 -07:00
Sam Gateau
373ccd07ec Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-22 13:14:57 -07:00
samcake
c6b20da8b5 fix typos 2015-05-22 13:12:03 -07:00
Andrew Meadows
603528eede Merge pull request #4945 from ctrlaltdavid/fix-float-warnings 
Fix some double to float conversion warnings in Windows builds
 2015-05-22 13:09:21 -07:00
Sam Gateau
e7e3eb2b7c FIrst version of the design for the Engine, the Tasks and a DrawTask. Introduced the ItemFilter 2015-05-22 12:58:18 -07:00
David Rowe
a01830f8f8 Fix some double to float conversion warnings in Windows builds 2015-05-22 12:32:02 -07:00
Andrew Meadows
461d08c0a9 merge upstream/master into andrew/bispinor 2015-05-22 11:35:02 -07:00
Andrew Meadows
bf225e4886 fix bug masking physics shape changes 2015-05-22 11:33:45 -07:00
Atlante45
e691a03c97 Remove push/popInputState 2015-05-22 20:30:54 +02:00
Atlante45
20ff43e29a Don't sync by default 2015-05-22 20:29:25 +02:00
Andrew Meadows
0431e8da36 put avatar body in right spot, and give it mass 2015-05-22 11:08:56 -07:00
Brad Hefta-Gaub
da8f99508c Merge pull request #4871 from huffman/console-error 
Add error handling to JSConsole
 2015-05-22 10:57:18 -07:00
Brad Hefta-Gaub
0315bb5e28 Merge pull request #4942 from ericrius1/deleteLook 
deleted look.js (no longer needed) and removed from default scripts
 2015-05-22 10:55:37 -07:00
Brad Hefta-Gaub
a3828246b8 Merge pull request #4938 from Atlante45/team-teaching 
Merge Master into Team teaching
 2015-05-22 10:48:08 -07:00
Brad Hefta-Gaub
7ed3a97bf2 Merge pull request #4939 from Atlante45/perf_timer_tweaks 
Deactivate PerformanceTimer when not in use
 2015-05-22 10:46:13 -07:00
Clément Brisset
e276926608 Add include/remove duplicate type 2015-05-22 18:23:42 +01:00
Eric Levin
d40d9cca69 deleted look.js (no longer needed) and removed from default scripts 2015-05-22 10:02:28 -07:00
Ryan Huffman
491861c1db Remove constness from GlowEffect RenderArgs params 2015-05-22 10:02:06 -07:00
Ryan Huffman
66dc555ba9 Remove context->enqueueBatch from RenderableBoxEntityItem 2015-05-22 09:59:34 -07:00
Ryan Huffman
5ac02f66ca Remove const from ApplicationOverlay::renderOverlay 2015-05-22 09:58:20 -07:00
Ryan Huffman
6fd474a1a3 Fix comment 2015-05-22 09:56:21 -07:00
Atlante45
c6ce5e7680 PerformanceTimer deactivated when not in use 2015-05-22 18:54:40 +02:00
Ryan Huffman
4a4c9c75fc Add gpu::context to RenderArgs and start using RenderArgs in place of the flags 2015-05-22 09:50:51 -07:00
Andrew Meadows
01cc629224 fix crashes during init and shutdown 2015-05-22 09:20:08 -07:00
Atlante45
e5aa696dda syncInputStateCache 2015-05-22 17:39:08 +02:00
Atlante45
9561086d0d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into simple_program 2015-05-22 17:21:50 +02:00
Atlante45
f089143cf1 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-22 17:16:51 +02:00
Clément Brisset
e980859059 Simple Program uses gpu API 2015-05-22 16:14:32 +01:00
Philip Rosedale
3a75dc4d1e Merge pull request #4937 from ctrlaltdavid/dde-face-detection-interval 
Throttle DDE face acquisition attempts in order to reduce CPU usage
 2015-05-22 07:42:15 -07:00
Atlante45
5d2187cedf Remove non batch call to bind/releaseSimpleProgram 2015-05-22 16:37:02 +02:00
Philip Rosedale
a1d0f4e3b8 Merge pull request #4936 from ericrius1/particleFix 
fixed problem with particle entities not showing up on other clients …
 2015-05-22 07:30:57 -07:00
Atlante45
314486ab88 Ignore scale in Transform when 0.0f 
Also cleaned up some coding standard
 2015-05-22 16:21:12 +02:00
David Rowe
a0c3c974a9 Throttle DDE face acquisition attempts in order to reduce CPU usage 2015-05-21 19:44:38 -07:00
Eric Levin
fe99941de3 fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp 2015-05-21 19:35:27 -07:00
Brad Hefta-Gaub
9b469226f3 Merge pull request #4934 from sethalves/fix-edit-js 
fix edit.js -- selectionManager.selections holds ids, not properties
 2015-05-21 18:32:05 -07:00
Seth Alves
258e3b901d fixes Sam made in my branch while trying to get a mesh to render 2015-05-21 18:20:52 -07:00
Seth Alves
35b1a6eee4 selectionManager.selections holds ids, not properties 2015-05-21 18:15:05 -07:00
Philip Rosedale
05a73d8a79 Merge pull request #4933 from ericrius1/inspectFix 
added oldMode as global vairable
 2015-05-21 18:14:40 -07:00
Eric Levin
ce1ccf1c40 added oldMode as global vairable 2015-05-21 18:08:04 -07:00
Philip Rosedale
e0e1744d2e Merge pull request #4931 from ericrius1/inspect 
inspect now uses accurate picking and camera slerps to looks at targe…
 2015-05-21 17:15:30 -07:00
Sam Gateau
bec8d1838c Adding th etask class 2015-05-21 17:12:01 -07:00
Andrew Meadows
ac8cac9783 avatars use DYNAMIC motion 2015-05-21 16:37:10 -07:00
Andrew Meadows
466af03fa9 support for ShapeInfo::offset 2015-05-21 16:25:05 -07:00