Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 09:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25493 commits 71 branches 56 tags 1.2 GiB
Commit graph

25493 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
4a59dc24c5 split entity-add and entity-edit messages 2015-05-20 14:52:03 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99 sort out script interface changes 2015-05-20 12:30:06 -07:00
Seth Alves
a769cfdaf2 client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
Seth Alves
b32e069f1d bump protocol version 2015-05-19 14:45:01 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Philip Rosedale
f188078623 Merge pull request #4912 from howard-stearns/grab-picking-crash 
Simplest fix for the grab crash that occurs with animated complex models
 2015-05-18 14:36:27 -07:00
Howard Stearns
bb4df26690 Fix indentation. 2015-05-18 14:25:35 -07:00
Philip Rosedale
85fac8394a Merge pull request #4914 from sethalves/airhockey-hull 
airhockey -- various adjustments
 2015-05-18 14:17:41 -07:00
Seth Alves
58b6205433 pull in Andrew's adjustment of paddle confinement 2015-05-18 14:10:58 -07:00
Howard Stearns
95be605233 Typo: unlock=>lock in rednerDebugMeshBoxes. 2015-05-18 14:05:13 -07:00
Seth Alves
34b381d48c have airHockey.js provide the floor of the table, rather than the collision hull 2015-05-18 13:47:10 -07:00
Howard Stearns
7e1b6a48c5 Merge branch 'master' of https://github.com/highfidelity/hifi into grab-picking-crash 2015-05-18 13:35:28 -07:00
Philip Rosedale
8706b7501c Merge pull request #4913 from sethalves/airhockey-hull 
airhockey -- put lowered friction back on table.  Andrew's fix for paddle vs corner
 2015-05-18 13:34:06 -07:00
Seth Alves
ab13eb2d16 put lowered friction back on table. incorportate Andrew's fix for the paddle crashing through the new table corners 2015-05-18 13:30:28 -07:00
Clément Brisset
cc63787eb1 Merge pull request #4910 from ZappoMan/avoidSegregateMeshGroupsCrash 
workaround for segregateMeshGroups() crash
 2015-05-18 22:19:28 +02:00
Howard Stearns
f2a66f3106 Simplest fix for the grab crash that occurs with animated complex models. 
(e.g., clicking on air hockey props in front of a spinning windmill).
 2015-05-18 13:08:11 -07:00
Stephen Birarda
87a0f2f474 Merge pull request #4911 from birarda/domain-wizard 
fix for table creation in settings.js
 2015-05-18 15:45:46 -04:00
Stephen Birarda
dff021ea15 fix for table creation on settings.js 2015-05-18 12:45:24 -07:00
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
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
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
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