Commit graph

1527 commits

Author SHA1 Message Date
unknown fe27d79239 Expose final composited target 2018-05-15 19:19:18 +02:00
unknown 819bd17a1d Set Material Slot node 2018-05-15 16:44:17 +02:00
unknown dbeda17af4 Set all material slots 2018-05-15 16:39:46 +02:00
unknown 53e695faa0 Use Subprojects dir 2018-05-13 22:21:22 +02:00
unknown d16d16d4b2 Kha subprojects functionality 2018-05-13 21:17:40 +02:00
luboslenco 3e365beda8 Update displace ratio 2018-05-10 13:52:07 +02:00
luboslenco 4afc7b45a6 Merge branch 'master' of https://github.com/armory3d/armory 2018-05-07 23:09:52 +02:00
luboslenco 68c057c987 Vertex or Tessellated displacement 2018-05-07 23:09:38 +02:00
Lubos Lenco 36491936a9
Merge pull request #620 from anadin/master
Little fix for Mix Nodes
2018-05-07 13:07:04 +02:00
luboslenco d80a4fce52 Normal Map and Bump node fixes 2018-05-07 13:02:24 +02:00
Andrei Nadin fceec443ef Merge branch 'master' of github.com:armory3d/armory 2018-05-07 17:43:20 +10:00
Andrei Nadin 471974c226 Fix Typo in mix nodes (was using wrong property for clamp)
Changed clamp to Math.clamp()
2018-05-07 17:41:36 +10:00
luboslenco 96933aabc2 Parse height input 2018-05-06 17:45:47 +02:00
luboslenco ab1eb0758b Implement Trait node 2018-05-05 13:36:20 +02:00
luboslenco c054635089 Check camera for canvas 2018-05-05 12:52:35 +02:00
luboslenco bcacf08a52 Fix project shader copy 2018-05-01 13:58:36 +02:00
luboslenco dcc211bc19 Increase ao range 2018-04-30 23:07:45 +02:00
luboslenco 2d11ef2656 Enable includes in project shaders 2018-04-25 22:38:52 +02:00
luboslenco 3452c05d2e Dir exists 2018-04-25 17:42:07 +02:00
luboslenco 842d48e036 Forward render capture 2018-04-24 20:24:36 +02:00
luboslenco 69716d5346 Fix render capture 2018-04-24 20:08:18 +02:00
unknown 428ba34196 Export physics simulation params 2018-04-23 12:21:46 +02:00
unknown 6ba57d3772 Clean Sources dir if empty 2018-04-22 21:52:22 +02:00
unknown 42eb1182b9 Fix rp_resolution description 2018-04-22 19:44:52 +02:00
luboslenco 9db8dade8d Fix single cone 2018-04-21 17:32:21 +02:00
Lubos Lenco d192b2c9d6
Merge pull request #605 from anadin/master
Stop Trait Node stopping compilation & Get/Set Gravity Nodes
2018-04-21 17:16:42 +02:00
Andrei Nadin 8398900ac4 Add Null check for Material Node 2018-04-21 14:23:31 +10:00
Andrei Nadin eff1a96f8f Get and Set Gravity Nodes 2018-04-21 14:03:03 +10:00
Andrei Nadin 5e9c8dad4c Temp fix to stop Trait Node from failing compilations
Still doesn’t return a trait…
2018-04-21 14:02:44 +10:00
luboslenco e3de9cd088 Resolution scale filter 2018-04-20 00:56:54 +02:00
luboslenco 7fd6521646 Add Mix and VectorMix nodes 2018-04-19 16:29:15 +02:00
luboslenco 7f4374480d Keep sounds with fake user 2018-04-19 13:51:17 +02:00
Lubos Lenco 3ba6a5d0fe
Merge pull request #601 from anadin/master
Add ApplyForceNodes
2018-04-18 08:55:51 +02:00
Andrei Nadin d8c6cef7f9 Add ApplyForceNodes
Think it would be good to add a global/local bool?
2018-04-18 10:26:33 +10:00
luboslenco 8285b6b3f0 More wasm binds 2018-04-17 12:23:55 +02:00
luboslenco 6d5b003689 Add wasm_api 2018-04-16 16:09:19 +02:00
luboslenco f2ae0010cb Patch Kha first 2018-04-16 09:01:03 +02:00
Lubos Lenco f7afeda6bd
Merge pull request #598 from anadin/master
Add #if to WasmScript - was breaking iOS builds
2018-04-16 08:48:08 +02:00
luboslenco cbf52cdff9 Update travis 2018-04-16 08:41:40 +02:00
Andrei Nadin d83caae736 Add #if to WasmScript - was breaking iOS builds 2018-04-16 14:22:00 +10:00
luboslenco 65dcb7f851 Minor 2018-04-16 00:24:44 +02:00
Lubos Lenco a94cbe3369
Merge pull request #597 from ubaldy/master
Orphaned REROUTE now behaves appropriately
2018-04-16 00:15:40 +02:00
Lubos Lenco 0451aa558e
Merge pull request #596 from Simonrazer/master
"Gate" node with else output
2018-04-16 00:12:42 +02:00
Jonathon Reach 3ddd05b90b Orphaned REROUTE nodes no longer fail to compile. Orphaned REROUTE has
no effect but can exist in the scene.
2018-04-15 17:27:11 -04:00
luboslenco 0667f9a71b WebAssembly modules 2018-04-15 11:55:42 +02:00
Simonrazer e7171433ae Gate with else
First try?
2018-04-15 10:36:30 +02:00
luboslenco af65880fbd Rename ApplyImpulseNodeAtLocation to ApplyImpulseAtLocationNode, format 2018-04-14 20:00:40 +02:00
Lubos Lenco b0beeff02e
Merge pull request #591 from anadin/master
Adding some new nodes and length() to VectorMath node
2018-04-14 19:34:25 +02:00
luboslenco a946dbbb6d Flags clean up 2018-04-14 15:07:05 +02:00
Andrei Nadin a6d6ee3a0c Merge branch 'master' of github.com:armory3d/armory 2018-04-14 12:30:45 +10:00