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

37394 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
f02cc8fd46 Tweaked bow position 2016-01-13 14:43:52 -08:00
Atlante45
504939f193 Use a unique_ptr to track gpu objects 2016-01-13 14:07:48 -08:00
Atlante45
8da027c56f Encapsulate GPUObject in a safer way 2016-01-13 13:51:53 -08:00
howard-stearns
830dcb582a Merge branch 'master' of https://github.com/highfidelity/hifi into physics-timing 2016-01-13 13:32:38 -08:00
howard-stearns
8a77e2ee95 Split physics perf timing into three parts: updateStates, stepSimulation, 
and harvestChanges.
 2016-01-13 13:31:37 -08:00
samcake
e41c49b19f Merge pull request #6818 from Atlante45/render-shape 
Move shape rendering code in DeferredLightingEffect to GeometryCache
 2016-01-13 12:27:27 -08:00
Atlante45
741c22c0ac Move SimpleProgramKey to cpp 2016-01-13 11:47:43 -08:00
Atlante45
1789878be1 Remove dead code 2016-01-13 11:47:43 -08:00
Atlante45
c30569cd55 Naming coding standard 2016-01-13 11:47:43 -08:00
Atlante45
205c14eb43 Remove unused headers 2016-01-13 11:47:43 -08:00
Atlante45
11dc3cd261 Move primitive rendering out of DeferredLightingEffect 2016-01-13 11:47:43 -08:00
Atlante45
12f9091dc1 Fix doInBatch lambdas 2016-01-13 11:47:43 -08:00
Kevini M. Thomas
007013254e Fixed entity script loading functionality for the jsstreamplayer. 2016-01-13 14:34:44 -05:00
ericrius1
0a371e4b75 Adjusted relative hand grab data for gun, ping ponger, and bow to to optimize for owen grabbing 2016-01-13 11:06:29 -08:00
Brad Davis
e8adcd9f1f Fix inability to stop local scripts 2016-01-12 21:11:47 -08:00
David Rowe
061657b703 Merge branch 'master' into 20763 2016-01-13 17:54:45 +13:00
Atlante45
e8d7411eea Indentation/Coding Standard 2016-01-12 20:49:38 -08:00
Atlante45
47586e97a6 Stay closer to the old code (Use early exit) 2016-01-12 20:49:25 -08:00
Atlante45
911375b7a1 Don't change apply zone logic 2016-01-12 20:49:25 -08:00
Atlante45
5e41421f9d Fix for skybox not always loading 2016-01-12 20:49:25 -08:00
Atlante45
0008b1a055 Code cleanup 2016-01-12 20:49:25 -08:00
Atlante45
3f90312375 Fix for XCode auto indent 2016-01-12 20:49:25 -08:00
ericrius1
061cf5021c Don't clean up whiteboard on script shutdown 2016-01-12 19:31:43 -08:00
ericrius1
9dae425bfd Some fixes to whiteboard to get rid of gaps between lines and jagged lines 2016-01-12 19:28:41 -08:00
Seth Alves
699431a9ab testing something with chris 2016-01-12 17:27:36 -08:00
Seth Alves
1128982e65 pull grab script changes over from another branch 2016-01-12 17:16:56 -08:00
Seth Alves
6f85ee135f Merge pull request #6796 from AndrewMeadows/collision-groups 
entity collision masks can be set via script
 2016-01-12 16:18:56 -08:00
Andrew Meadows
6a5a74700f activate sprung objects when action strong enough 2016-01-12 15:11:27 -08:00
Andrew Meadows
2288d96868 fix CharacterController ray cast for floor 2016-01-12 15:11:27 -08:00
Andrew Meadows
c52c543ab8 use strings for JS collisionGroup API 2016-01-12 15:11:27 -08:00
Andrew Meadows
222398e5cc no packet version check for collision mask 2016-01-12 15:10:18 -08:00
Andrew Meadows
00e5d040a2 use collision masks to prevent grab-bootstrap 2016-01-12 15:10:18 -08:00
Andrew Meadows
6c49d81475 collision mask bit reinterpretation 
also cache sessionID in static methods inside PhysicsEngine
 2016-01-12 15:08:52 -08:00
Andrew Meadows
502921e877 more consistency for collision group values 2016-01-12 15:08:52 -08:00
Andrew Meadows
c9b125612c fix bugs 2016-01-12 15:08:52 -08:00
Andrew Meadows
e1ba4ff0a8 add CollisionMask entity property 2016-01-12 15:08:52 -08:00
Brad Hefta-Gaub
cd167e43fb Merge pull request #6812 from jherico/running_scripts 
Running scripts in QML
 2016-01-12 13:40:47 -08:00
Brad Davis
e7bfcba44f Fix 'load' button 2016-01-12 13:17:06 -08:00
Brad Davis
2ed54d8ea7 Cleanup running scripts 2016-01-12 13:11:03 -08:00
Brad Davis
f352332924 Fix logging warning 2016-01-12 13:09:16 -08:00
Brad Hefta-Gaub
90f4ca7b71 Merge pull request #6817 from jherico/script_crash 
Fix crash on shutdown due to lifetime of scripts
 2016-01-12 13:05:35 -08:00
Howard Stearns
d1a72e8d63 Merge pull request #6807 from hyperlogic/tony/grab-script-hand-animation 
Move hand animation control into grab script
 2016-01-12 13:02:59 -08:00
Brad Davis
dcc6739bce Final functionality for running scripts 2016-01-12 12:40:46 -08:00
Brad Davis
a9eb5b8229 Load script from file 2016-01-12 12:40:45 -08:00
Brad Davis
4f975de6a6 Working on crash fixes, file open dialog 2016-01-12 12:40:43 -08:00
Brad Davis
21534cbde0 Layout for running scripts 2016-01-12 12:40:42 -08:00
Brad Davis
55af5eaf06 Fix crash on shutdown due to lifetime of scripts 2016-01-12 12:40:02 -08:00
Anthony J. Thibault
fee6bda721 Updated hand animation references. 2016-01-12 12:18:26 -08:00
Brad Hefta-Gaub
4c98c3a7a5 Merge pull request #6815 from ctrlaltdavid/20773 
Resume Interface in 1st person if exit in 1st person
 2016-01-12 12:05:12 -08:00
Brad Hefta-Gaub
8619be28ef Merge pull request #6816 from ctrlaltdavid/20772 
Don't use cache when use load script "from Disk" button
 2016-01-12 11:46:41 -08:00