Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 23:34:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
27607 commits 75 branches 59 tags 1.2 GiB
Commit graph

1200 commits

Author SHA1 Message Date
Seth Alves
300d35219d move functions our of header to cpp file 2015-06-26 16:54:01 -07:00
Seth Alves
b4537b081f fix clearActions 2015-06-26 16:02:47 -07:00
David Rowe
8d83e23bab Improve entity properties list code comment 2015-06-26 15:37:16 -07:00
Seth Alves
70aa762f61 merge from upstream 2015-06-26 15:34:10 -07:00
ZappoMan
ccbc048f64 repair bad ordering of PROP_SCRIPT_TIMESTAMP 2015-06-26 14:59:40 -07:00
Seth Alves
bc7271769c merge from master 2015-06-26 14:29:40 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-06-26 13:05:51 -07:00
Seth Alves
005bd8bda5 merge from upstream 2015-06-26 12:33:35 -07:00
Brad Hefta-Gaub
2c30711229 Merge pull request #5210 from bwent/faceCameraProp 
Added faceCamera property for text entities
 2015-06-26 12:29:25 -07:00
Seth Alves
d09588b7fa put upper bound on size of serilized action parameters so they'll fit in MTU 2015-06-26 12:11:34 -07:00
bwent
aa865680ab Added faceCamera property to Text Entities 
…and removed from base
 2015-06-25 15:38:38 -07:00
Seiji Emery
6e87f44ec7 Merge remote-tracking branch 'upstream/master' 2015-06-24 15:12:57 -07:00
bwent
0516caaa32 Added CHECK_PROPERTY_CHANGE macro 2015-06-24 14:58:33 -07:00
Seth Alves
28582ed14d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-23 19:50:35 -07:00
bwent
99cd9bada1 Added Billboard entity property and enabled billboarding for text entities 2015-06-23 16:22:34 -07:00
Seth Alves
a46e8ed14c quiet compiler 2015-06-23 15:27:35 -07:00
Seth Alves
0af137af36 save encoded action data rather than generating it on demand 2015-06-23 15:27:25 -07:00
ericrius1
b1190bee6e deleted empty files I accidently committed. 2015-06-23 14:13:13 -07:00
David Rowe
93509f4c6e Code review 2015-06-23 11:25:02 -07:00
Seth Alves
6e34678a59 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-23 10:48:21 -07:00
Seth Alves
4bf4e9f5da Merge pull request #5164 from ericrius1/lineBounds 
Line bounds
 2015-06-23 10:47:38 -07:00
Seiji Emery
dfe58a5ed4 Disabled Model (entity) Tests, as they are waaay out of date and will not run with the current codebase. These should get reimplemented at some point. 2015-06-22 17:42:07 -07:00
Seth Alves
f75506bf1b Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-22 15:37:10 -07:00
Seth Alves
7f4e3f8216 when deserializing action, remove any existing actions that weren't part of the serialized data 2015-06-22 13:12:34 -07:00
ericrius1
362d9a2481 syncing brush sphere with line color 2015-06-22 10:35:00 -07:00
Seth Alves
c14276145d lock when reading or writing _actionsToAdd or _actionsToRemove 2015-06-22 07:19:40 -07:00
ericrius1
dbec1aad0c line entity points are now local to entity position. Changed paint script to reflect this 2015-06-19 18:54:28 -07:00
Seth Alves
5381e6e9bb entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion 2015-06-19 16:20:07 -07:00
Seth Alves
6deedd19a3 zero velocities when we clear simulatorID 2015-06-19 16:19:21 -07:00
Seth Alves
fca06d9d3d add actionData to properties that EntityItem transmits and receives 2015-06-19 09:36:06 -07:00
Seth Alves
fce551099f first stab at sending action data across wire 2015-06-18 18:32:57 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-18 18:17:59 -07:00
ericrius1
830a8b6909 checking for bounds and modified paint script to start a new line entity if user paints outside of line entity's bounding box 2015-06-18 18:14:03 -07:00
Seth Alves
32cf669d8b moving toward sending actions over wire 2015-06-18 17:51:41 -07:00
Philip Rosedale
2f080a8e29 Merge pull request #5147 from sethalves/more-actions 
offset action
 2015-06-18 17:35:50 -07:00
ericrius1
8183e7393d adding check for points inside bounds' 2015-06-18 17:00:27 -07:00
ericrius1
6a5deaaef1 returning true from set line points 2015-06-18 16:54:39 -07:00
ericrius1
2b4146125f adding logic to check points of line are inside bounds 2015-06-18 16:27:06 -07:00
Seth Alves
816726efdc Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-18 15:33:46 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Seth Alves
3c90c851e9 start on code to de/serialize actions 2015-06-18 15:01:34 -07:00
Seth Alves
7d707447ca move multi-line function out of header 2015-06-18 11:07:50 -07:00
Seth Alves
97eeb20625 Merge branch 'master' of github.com:highfidelity/hifi into overloaded-virtual 2015-06-18 11:04:24 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
David Rowe
6623d0c552 Add "Reload" button associated with entity editor's script URL field 
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
 2015-06-17 16:11:32 -07:00
Seth Alves
fbfa73af2d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 15:18:17 -07:00
Brad Davis
ae1c9603b9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
Seth Alves
22ac61e476 work around hiding of virtual functions in PolyVox entity classses 2015-06-17 14:40:24 -07:00
ZappoMan
58ee5217e3 fix some warnings 2015-06-17 14:08:02 -07:00
Seth Alves
3e758a8f43 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 11:53:12 -07:00
Seth Alves
85564199c6 git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point 2015-06-17 11:22:10 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Brad Davis
ba13b7820c Working on overlay refactor 2015-06-16 09:58:03 -07:00
Seth Alves
6def25de92 formatting 2015-06-15 16:22:06 -07:00
Seth Alves
445381bb6b fix DEFAULT_VOXEL_DATA, recompress voxel data when a script calls setVoxel. Use provided transform when rendering. 2015-06-15 16:07:28 -07:00
Seth Alves
4a00bd3e7f quiet compiler 2015-06-15 16:06:20 -07:00
Seth Alves
5f3b902798 remove debugging print 2015-06-15 11:24:29 -07:00
Seth Alves
c1668553fd make sure that the root node always appends an entity count (even if it's zero). This keeps the unreasonably-deep-recursion warnings from happening 2015-06-15 11:22:07 -07:00
Seth Alves
8ed9a3ca02 add handedness setting to avatar-hold action. update stick.js to allow use of hydra 2015-06-11 11:04:19 -07:00
Seth Alves
ba4fd7adf6 windows didn't like EntityActionFactoryInterface::factory not returning an error 2015-06-10 19:23:01 -07:00
Seth Alves
45c7cd4929 respond to code review, add a simple hold-a-stick script 2015-06-10 18:48:51 -07:00
Seth Alves
eccf4eb8a8 hold action works 2015-06-10 17:05:49 -07:00
Seth Alves
1c0c7f0fe3 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 15:30:28 -07:00
Niraj Venkat
182a3e918c Hyperlink properties now propagate locally and over network 2015-06-10 13:12:18 -07:00
Seth Alves
3dcc6c9b8c make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus. 2015-06-10 12:04:44 -07:00
Niraj Venkat
c45d409383 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-10 09:51:17 -07:00
Eric Levin
286b7bf573 changed comment to use TREE_SCALE instead of 16000 2015-06-10 08:48:26 -07:00
Eric Levin
f51b1d2ac2 clamping line points between 0 and TREE_SCALE 2015-06-09 17:30:15 -07:00
Niraj Venkat
a577d7955c Removed classes and the "hyperlink entity" 2015-06-09 11:27:57 -07:00
Seth Alves
ccb2f17b33 grab.js rotation sort-of works now 2015-06-09 11:21:13 -07:00
Niraj Venkat
2bb1bf8afe Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-09 10:33:39 -07:00
Niraj Venkat
1bf0b15bb0 Removing unnecessary files 2015-06-09 10:33:05 -07:00
Niraj Venkat
0004b1a81c Reversing previous entity work and creation of property group 2015-06-09 10:32:25 -07:00
Seth Alves
42f94307d5 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-09 09:51:29 -07:00
Atlante45
303026d86b Reduce qDebug calls 2015-06-09 15:26:41 +02:00
Seth Alves
eb85f7f818 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-08 17:37:56 -07:00
Seth Alves
b3bc9c3ef0 first attempt at getting spring-action to handle rotation 2015-06-08 17:10:13 -07:00
Niraj Venkat
dbb447c9b5 Exposing Hyperlink type to javascript 2015-06-08 16:09:06 -07:00
Niraj Venkat
63665d720a Fixed bug by adding hyperlink props to flags. Safe to merge 2015-06-08 15:32:21 -07:00
Seth Alves
1e858d8bc5 start on spring action 2015-06-08 14:16:03 -07:00
Niraj Venkat
cd93128236 [ERRORS] Starting on hyperlink entity and properties 2015-06-08 13:29:54 -07:00
ZappoMan
5d6112d9c5 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 12:29:32 -07:00
ZappoMan
7dc0e8a66c Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 12:21:29 -07:00
Seth Alves
b425cc6491 merge from upstream 2015-06-05 11:56:33 -07:00
Seth Alves
b0480af040 Merge pull request #5053 from AndrewMeadows/isothermal 
fix crash during bogus reconnect on login
 2015-06-05 11:38:23 -07:00
Seth Alves
aff582287d use const references for arguments in action-related calls 2015-06-05 11:26:54 -07:00
ZappoMan
f8a2fff5a7 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 11:06:10 -07:00
Seth Alves
28c034698f Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-05 10:41:20 -07:00
Seth Alves
c5143cdfa0 Merge pull request #5027 from AndrewMeadows/isentropic 
cleanup around sending all "terse update" data whenever some of it changes
 2015-06-05 10:41:06 -07:00
Seth Alves
51f5730e68 formatting 2015-06-05 10:05:11 -07:00
Seth Alves
eb912892dc code review 2015-06-05 09:56:34 -07:00
ZappoMan
807cc3db24 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 09:37:39 -07:00
Seth Alves
086b9d404a fix return-type in lambda 2015-06-05 08:59:08 -07:00
Andrew Meadows
9cb7cb314d update minimum version support 2015-06-05 08:43:48 -07:00
Seth Alves
3dbf28b7b4 use lambdas to remove some repeated code 2015-06-05 07:33:39 -07:00
Seth Alves
b2db5f7fee update grab.js to use pull-to-point action, various other fixes 2015-06-05 07:10:44 -07:00
Seth Alves
9a67f35b59 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-04 19:02:46 -07:00
Seth Alves
ba42b0dcc4 updateAction and deleteAction 2015-06-04 17:51:59 -07:00
Eric Levin
5e15c14539 added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script" 2015-06-04 16:45:32 -07:00
Seth Alves
5e5bc497d9 remove debugging prints 2015-06-04 12:44:08 -07:00