Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 06:52:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
41515 commits 67 branches 56 tags 1.2 GiB
Commit graph

5792 commits

Author SHA1 Message Date
James B. Pollack
a1004919a5 Merge branch 'musicbox' into homereset 2016-03-28 15:45:03 -07:00
James B. Pollack
50cc632b9c Merge pull request #7424 from ericrius1/batonSoundEntityTest 
Add a test case for playing a short sound from an entity using virtual baton
 2016-03-27 10:49:59 -07:00
James B. Pollack
e261519b11 Update utils.js 
remove extra letter that would be crashing things
 2016-03-25 19:29:18 -07:00
Brad Davis
a47614c9b6 Revert "Build a better event bridge" 
This reverts commit a43fde0803.
 2016-03-25 09:48:25 -07:00
Brad Hefta-Gaub
fc41c5bca9 Merge pull request #7448 from Menithal/entity-properties-refresh-cache 
Added Refresh Buttons to entityProperties
 2016-03-24 17:34:46 -07:00
Brad Hefta-Gaub
d26fe77803 Merge pull request #7454 from jherico/qml_crashes 
Fix async issues related to JS <-> App <-> QML <-> HTML communication
 2016-03-24 17:32:38 -07:00
Menithal
24f2bdac77 Fixed Styling 2016-03-24 20:58:32 +02:00
Brad Davis
a43fde0803 Build a better event bridge 2016-03-24 11:01:06 -07:00
Andrew Meadows
c8655b8524 Merge pull request #7438 from PhilipRosedale/airship 
Sample script:  Airship
 2016-03-24 08:40:36 -07:00
Philip Rosedale
8e572ed635 Merge pull request #7423 from thoys/20859 
CR for Job #20859 - Fix particle color selection
 2016-03-24 00:20:59 -07:00
PhilipRosedale
8c4ecc64d9 fix entity script location 2016-03-23 22:49:18 -07:00
PhilipRosedale
7b326c9d7b fixes per review 2016-03-23 17:56:02 -07:00
Menithal
12ecd592ab Added Refresh Buttons to entityProperties 
Pressing buttons next to the url bar will now allow for content to have an
automatic unix timestamp to be applied / updated to the end of the url.
Applies for all url entity Properties
 2016-03-24 01:14:48 +02:00
PhilipRosedale
7e658896e6 update header 2016-03-22 22:39:55 -07:00
PhilipRosedale
472dd07625 airship from hack project 2016-03-22 22:39:22 -07:00
ericrius1
8ce23e2345 simple baton test 2016-03-22 17:41:29 -07:00
ericrius1
7450a2ea3a update 2016-03-22 17:38:56 -07:00
ericrius1
e5364fd186 update 2016-03-22 17:33:18 -07:00
ericrius1
60bb77fd34 unload baton 2016-03-22 17:12:42 -07:00
ericrius1
107479039a update 2016-03-22 17:10:04 -07:00
ericrius1
608821b50b simple baton 2016-03-22 17:06:49 -07:00
ericrius1
ad5a111b85 simple baton 2016-03-22 17:04:47 -07:00
ericrius1
dfffe5f431 more removal 2016-03-22 15:02:44 -07:00
ericrius1
a0e8e00357 removed cache defeating code and fixed whitespace 2016-03-22 15:02:00 -07:00
ericrius1
918c61c166 removed extra code from virtualBaton 2016-03-22 10:34:10 -07:00
ericrius1
c9c5d3d8bc removed VRVJ files 2016-03-22 10:32:04 -07:00
ericrius1
94283904b8 update 2016-03-22 10:26:13 -07:00
ericrius1
1c876fe110 update 2016-03-22 10:16:49 -07:00
ericrius1
f043b27a56 hardcoded num avatars 2016-03-22 10:12:44 -07:00
ericrius1
130eb6b619 working for one; 2016-03-22 10:07:59 -07:00
ericrius1
bc8a8ac703 fix syntax error 2016-03-22 10:00:44 -07:00
ericrius1
2bb11c5dc6 unload baton 2016-03-22 09:59:10 -07:00
Thijs Wenker
d47e8eb999 Fix setting colors in ParticleExplorer without having the particle entity disappear. Handles Hex strings as well as color arrays. 2016-03-22 17:39:57 +01:00
ericrius1
2dce75bfb0 baton sound 2016-03-21 17:22:18 -07:00
Philip Rosedale
c8816f8e76 Merge pull request #7389 from Menithal/on-grab-fix 
Grab.js: Update Position on Mouse Grab Start
 2016-03-21 17:10:00 -07:00
ericrius1
adeaa9475e num 2016-03-21 16:49:55 -07:00
ericrius1
9c18d6c016 change name 2016-03-21 16:47:51 -07:00
ericrius1
efd56ac22a spawner 2016-03-21 16:45:23 -07:00
ericrius1
51508b467c uupdate 2016-03-21 15:59:03 -07:00
ericrius1
98e43a8d0f more logging 2016-03-21 15:54:47 -07:00
ericrius1
b4509e428b bugs 2016-03-21 15:37:20 -07:00
ericrius1
81901dc73d log change 2016-03-21 15:04:57 -07:00
ericrius1
b8cb71e16a debug 2016-03-21 15:02:39 -07:00
ericrius1
7659aed97a dont delete the entity when spawner script shutdown 2016-03-21 14:42:53 -07:00
ericrius1
b4e400f3aa baton sound logging updates 2016-03-21 14:42:28 -07:00
ericrius1
493a91fa27 with debug box 2016-03-21 14:32:22 -07:00
ericrius1
e5b2483604 sound seems to be working" 2016-03-21 14:09:02 -07:00
ericrius1
68dc5a8251 just playing on start update 2016-03-21 13:57:54 -07:00
ericrius1
b7534fbd57 basics of virtual baton 2016-03-21 13:52:26 -07:00
ericrius1
6c5ad187a0 Merge remote-tracking branch 'upstream/master' 2016-03-21 11:51:38 -07:00