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

25697 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
ad0b0cfade FIxing one more issue with compilation on ubuntu regarding the template functions specializationand the namespace 2015-05-26 11:40:35 -07:00
samcake
dd9d758da1 Fixing the compilation issue for real 2015-05-26 10:53:23 -07:00
Sam Gateau
0083ba6f85 trying again 2015-05-25 17:39:31 -07:00
Sam Gateau
ad054a640e Fixing a problem with Mac/ubuntu build maybe 2015-05-25 17:21:03 -07:00
Sam Gateau
f0ab6d96f5 merge with upstream team-teaching 2015-05-24 19:45:37 -07:00
Sam Gateau
35b8d45bee Insert a first scene and the engine in the Application and render a first Item 2015-05-24 17:03:43 -07:00
Clément Brisset
ec089ed6e8 Merge pull request #4955 from ZappoMan/team-teaching 
Team teaching - merge from master
 2015-05-23 07:47:57 +02:00
ZappoMan
58c7b286ef Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-22 22:21:29 -07:00
Brad Hefta-Gaub
910c8549fc Merge pull request #4951 from huffman/ctx 
Team Teaching - Add gpu::context to RenderArgs and use RenderArgs in more render() methods
 2015-05-22 22:20:45 -07:00
Brad Hefta-Gaub
225021671a Merge pull request #4950 from ericrius1/particleScriptName 
renamed ajt-test to particles.js since ajt-test doesn't tell us anyth…
 2015-05-22 22:17:39 -07:00
Brad Hefta-Gaub
d7b2ca64cd Merge pull request #4949 from sethalves/octree-send-thread-adjustments 
entity-server sends initial planky more reliably
 2015-05-22 22:17:17 -07:00
Brad Hefta-Gaub
b9766aaf70 Merge pull request #4952 from huffman/remove-scale-assert 
Temporarily remove isValidScale assert
 2015-05-22 18:40:15 -07:00
Ryan Huffman
43317bc829 Temporarily remove isValidScale assert 2015-05-22 17:00:39 -07:00
Ryan Huffman
822ae800c5 Update Model::endScene to require RenderArgs 2015-05-22 16:17:01 -07:00
Ryan Huffman
8380eec03b Update Model::renderCore to use RenderArgs 2015-05-22 16:10:43 -07:00
Ryan Huffman
47d9cf42c5 Remove unused lodManager 2015-05-22 16:04:05 -07:00
Ryan Huffman
05f8ba558f Update RenderArgs construction in paintGL 2015-05-22 16:02:24 -07:00
Ryan Huffman
7be646d62e Make gpu::context the first RenderArgs ctor parameter 2015-05-22 16:02:10 -07:00
Ryan Huffman
1d12744781 Remove commented out code 2015-05-22 15:34:19 -07:00
Ryan Huffman
bffcfa2ab8 Add cache sync flag in Context::enqueueBatch 2015-05-22 15:34:05 -07:00
Ryan Huffman
d1a5662ca7 Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
 2015-05-22 15:33:40 -07:00
Eric Levin
71c0aa4913 renamed ajt-test to particles.js since ajt-test doesn't tell us anything about what the script does 2015-05-22 15:33:38 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
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
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
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